diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..205f821d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,49 @@
+## Summary of Changes
+
+<!--
+  Required:
+    - Enter a jira link for this PR.
+-->
+
+## Motivation and Context
+
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested? (Test Plan)
+
+<!--
+  Required:
+    - Please describe in detail how you tested your changes.
+    - Include details of your testing environment, and the tests you ran to
+    - See how your change affects other areas of the code, etc. -
+    - Any useful notes explaining how best to test and verify.
+    - Bonus points for screenshots and videos!
+-->
+
+## Other information
+
+<!-- Any useful information. -->
+
+## Screenshots (if appropriate):
+
+## Final checklist
+
+- [ ] Did you test both iOS and Android(if applicable)?
+- [ ] Is a security review needed(consenlabs/security)?
+
+## Security checklist (only for leader check)
+
+- [ ] No backdoor risk
+  - Check for unknown network request urls, and script/shell files with unclear purposes,
+  - The backend service cannot expose leaked data interfaces for various reasons (even for testing purposes)
+- [ ] No network communication protocol risk
+  - Check whether to introduce unsafe network calls such as http/ws
+- [ ] No import potentially risk 3rd library
+  - Check whether 3rd dependent library is import
+  - Don't use an unknown third-party library
+  - Check the 3rd library sources are fetched from normal sources, such as npm, gomodule, maven, cocoapod, Do not use unknown sources
+  - Check github Dependabot alerts, Whether to add new issues
+- [ ] Private data not exposed
+  - Check whether there are exclusive ApiKey, privatekey and other private information uploaded to git
+  - Check if the packaged keystore has been uploaded to git
diff --git a/.github/workflows/build-release-android.yml b/.github/workflows/build-release-android.yml
index 7a09f491..98fb692d 100644
--- a/.github/workflows/build-release-android.yml
+++ b/.github/workflows/build-release-android.yml
@@ -92,7 +92,7 @@ jobs:
        popd
     
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@v3
       with:
        gradle-version: 7.0.1
 
diff --git a/.gitignore b/.gitignore
index bbc4e908..df167730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,5 +92,8 @@ imkey-core/ikc-tools/android-debug.sh
 imkey-core/ikc-tools/build-android-linux.sh
 imkey-core/ios-release/**
 imkey-core/mobile-sdk/imKeyCoreX/Products/
+imkey-core/mobile-sdk/imKeyCoreX/imKeyCoreX/libconnector.a
 
 script/*-local.sh
+
+ios-*.zip
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 6a579661..7d6c5d7b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 dependencies = [
  "lazy_static",
- "regex 1.7.3",
+ "regex",
 ]
 
 [[package]]
@@ -29,84 +29,58 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
  "crypto-common",
  "generic-array 0.14.7",
 ]
 
 [[package]]
-name = "aes-ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher 0.2.5",
- "ctr",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
-dependencies = [
- "cipher 0.2.5",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "aesni"
-version = "0.10.0"
+name = "aes"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
 dependencies = [
- "cipher 0.2.5",
- "opaque-debug 0.3.0",
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.6.10"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.20"
+name = "android-tzdata"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
 
 [[package]]
-name = "alga"
-version = "0.9.3"
+name = "android_system_properties"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
- "approx",
- "num-complex",
- "num-traits",
+ "libc",
 ]
 
 [[package]]
@@ -120,18 +94,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
-
-[[package]]
-name = "approx"
-version = "0.3.2"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-dependencies = [
- "num-traits",
-]
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "array-bytes"
@@ -145,15 +110,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -162,19 +118,19 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "async-trait"
-version = "0.1.68"
+version = "0.1.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -191,7 +147,7 @@ checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -240,7 +196,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5e6bb7b4f714af5a06b214d55d390246a7daa0a0da1098497e8bd57691fa55"
 dependencies = [
- "bs58 0.2.5",
+ "bs58",
  "cash_addr",
  "failure",
 ]
@@ -257,28 +213,6 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
 
-[[package]]
-name = "bellman_ce"
-version = "0.3.2"
-source = "git+https://github.com/matter-labs/bellman?branch=beta#416f79d3f93fc855fb96bb61bfe73d2472e95548"
-dependencies = [
- "bit-vec",
- "blake2s_simd",
- "byteorder 1.4.3",
- "cfg-if 1.0.0",
- "futures 0.3.27",
- "hex 0.4.3",
- "num_cpus",
- "pairing_ce",
- "rand 0.4.6",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bitcoin"
 version = "0.29.2"
@@ -302,6 +236,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -314,17 +254,6 @@ dependencies = [
  "wyz",
 ]
 
-[[package]]
-name = "blake2"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174"
-dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -334,17 +263,6 @@ dependencies = [
  "digest 0.10.6",
 ]
 
-[[package]]
-name = "blake2-rfc_bellman_edition"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc60350286c7c3db13b98e91dbe5c8b6830a6821bc20af5b0c310ce94d74915"
-dependencies = [
- "arrayvec 0.4.12",
- "byteorder 1.4.3",
- "constant_time_eq 0.1.5",
-]
-
 [[package]]
 name = "blake2b-rs"
 version = "0.2.0"
@@ -373,19 +291,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq 0.2.5",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
 ]
 
 [[package]]
 name = "blake2s_simd"
-version = "0.5.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
+checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq 0.1.5",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.3.0",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "cc",
+ "cfg-if",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
@@ -418,16 +349,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "block-modes"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
-dependencies = [
- "block-padding 0.2.1",
- "cipher 0.2.5",
-]
-
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -439,24 +360,11 @@ dependencies = [
 
 [[package]]
 name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
-[[package]]
-name = "bls-signatures"
-version = "0.6.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863020d4fead1c6090d754cf542cd723c124859543f595c65e8c6f11377a4223"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
 dependencies = [
- "fff",
- "groupy",
- "hkdf 0.8.0",
- "paired",
- "rand_core 0.5.1",
- "rayon",
- "sha2ni",
- "thiserror",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -506,17 +414,11 @@ dependencies = [
  "sha2 0.8.2",
 ]
 
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byte-slice-cast"
@@ -551,22 +453,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder 1.4.3",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
 [[package]]
 name = "bytes"
 version = "1.4.0"
@@ -590,16 +476,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "cc"
-version = "1.0.79"
+name = "cbc"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
 
 [[package]]
-name = "cfg-if"
-version = "0.1.10"
+name = "cc"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cfg-if"
@@ -609,15 +501,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.20"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
- "js-sys",
- "num-integer",
+ "android-tzdata",
+ "iana-time-zone",
  "num-traits",
- "wasm-bindgen",
- "winapi",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -627,17 +518,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768"
 dependencies = [
  "multibase 0.8.0",
- "multihash",
- "unsigned-varint",
-]
-
-[[package]]
-name = "cipher"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-dependencies = [
- "generic-array 0.14.7",
+ "multihash 0.13.2",
+ "unsigned-varint 0.5.1",
 ]
 
 [[package]]
@@ -655,18 +537,18 @@ dependencies = [
 name = "coin-bch"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bch_addr",
  "bitcoin",
  "bitcoin_hashes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
  "num-bigint 0.4.3",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
  "secp256k1",
  "serde",
  "serde_json",
@@ -677,18 +559,17 @@ dependencies = [
 name = "coin-bitcoin"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
  "bitcoin_hashes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
  "num-bigint 0.4.3",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "ring",
+ "prost",
+ "prost-types",
  "secp256k1",
 ]
 
@@ -696,21 +577,21 @@ dependencies = [
 name = "coin-btc-fork"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base64 0.13.1",
  "bech32 0.9.1",
  "bitcoin",
  "bitcoin_hashes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
  "lazy_static",
  "num-bigint 0.4.3",
  "parking_lot",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
  "secp256k1",
  "serde",
  "serde_json",
@@ -721,32 +602,33 @@ dependencies = [
 name = "coin-ckb"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base64 0.13.1",
  "bech32 0.9.1",
  "bitcoin",
  "blake2b-rs",
  "byteorder 1.4.3",
- "failure",
- "hex 0.4.3",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
  "lazy_static",
- "prost 0.11.8",
+ "prost",
  "secp256k1",
+ "thiserror",
 ]
 
 [[package]]
 name = "coin-cosmos"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base64 0.13.1",
  "bech32 0.9.1",
  "bitcoin",
  "bitcoin_hashes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
@@ -754,9 +636,8 @@ dependencies = [
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "ring",
+ "prost",
+ "prost-types",
  "secp256k1",
  "serde",
  "serde_derive",
@@ -767,29 +648,29 @@ dependencies = [
 name = "coin-eos"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
  "bitcoin_hashes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
 ]
 
 [[package]]
 name = "coin-ethereum"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
+ "base64 0.13.1",
  "bitcoin",
  "bitcoin_hashes",
- "bytes 1.4.0",
- "dotenv",
+ "bytes",
  "ethereum-types",
- "failure",
- "hex 0.4.3",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
@@ -799,37 +680,38 @@ dependencies = [
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "regex 1.7.3",
+ "prost",
+ "prost-types",
+ "regex",
  "rlp",
  "rustc-hex",
  "secp256k1",
  "serde",
  "serde_derive",
  "serde_json",
- "tiny-keccak 2.0.2",
+ "tiny-keccak",
 ]
 
 [[package]]
 name = "coin-filecoin"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base32",
  "base64 0.13.1",
  "bech32 0.9.1",
+ "bitcoin",
  "bitcoin_hashes",
  "blake2b-rs",
- "bytes 1.4.0",
- "failure",
+ "bytes",
  "forest_address",
  "forest_bigint",
  "forest_cid",
- "forest_crypto 0.4.1",
+ "forest_crypto",
  "forest_encoding",
- "forest_message 0.6.1",
+ "forest_message",
  "forest_vm",
- "hex 0.4.3",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
@@ -837,12 +719,10 @@ dependencies = [
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "ring",
+ "prost",
+ "prost-types",
  "secp256k1",
  "serde",
- "serde_cbor",
  "serde_json",
 ]
 
@@ -850,13 +730,13 @@ dependencies = [
 name = "coin-substrate"
 version = "0.1.0"
 dependencies = [
- "failure",
- "hex 0.4.3",
+ "anyhow",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
  "sp-core",
  "sp-keyring",
  "sp-runtime",
@@ -866,48 +746,39 @@ dependencies = [
 name = "coin-tezos"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
  "blake2b_simd 1.0.1",
- "failure",
- "hex 0.4.3",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
 ]
 
 [[package]]
 name = "coin-tron"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
- "failure",
- "hex 0.4.3",
+ "byteorder 1.4.3",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
  "keccak-hash",
- "prost 0.11.8",
+ "prost",
  "secp256k1",
- "tiny-keccak 2.0.2",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen",
+ "tiny-keccak",
 ]
 
 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constant_time_eq"
@@ -917,76 +788,48 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
+checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
+name = "constant_time_eq"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
-name = "cpufeatures"
-version = "0.2.6"
+name = "core-foundation"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
+ "core-foundation-sys",
  "libc",
 ]
 
 [[package]]
-name = "crossbeam-channel"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
+name = "core-foundation-sys"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
-name = "crossbeam-epoch"
-version = "0.9.14"
+name = "core2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
+ "memchr",
 ]
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.8.15"
+name = "cpufeatures"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
- "cfg-if 1.0.0",
+ "libc",
 ]
 
 [[package]]
@@ -1006,16 +849,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.4",
- "subtle 1.0.0",
-]
-
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -1023,17 +856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
-dependencies = [
- "generic-array 0.14.7",
- "subtle 2.4.1",
+ "subtle",
 ]
 
 [[package]]
@@ -1043,7 +866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.4.1",
+ "subtle",
 ]
 
 [[package]]
@@ -1073,11 +896,11 @@ dependencies = [
 
 [[package]]
 name = "ctr"
-version = "0.6.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher 0.2.5",
+ "cipher",
 ]
 
 [[package]]
@@ -1095,7 +918,7 @@ dependencies = [
  "byteorder 1.4.3",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle 2.4.1",
+ "subtle",
  "zeroize",
 ]
 
@@ -1108,10 +931,38 @@ dependencies = [
  "byteorder 1.4.3",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.4.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.6",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
+ "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "darling"
 version = "0.10.2"
@@ -1130,8 +981,8 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "strsim",
  "syn 1.0.109",
 ]
@@ -1143,21 +994,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
- "quote 1.0.26",
+ "quote",
  "syn 1.0.109",
 ]
 
 [[package]]
-name = "data-encoding"
-version = "2.3.3"
+name = "dashmap"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
-
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -1165,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3"
 dependencies = [
  "data-encoding",
  "syn 1.0.109",
@@ -1184,6 +1048,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "derivation-path"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0"
+
 [[package]]
 name = "derive_builder"
 version = "0.9.0"
@@ -1192,8 +1072,8 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
 dependencies = [
  "darling",
  "derive_builder_core",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1204,8 +1084,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
 dependencies = [
  "darling",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1215,8 +1095,8 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1253,16 +1133,7 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "dotenv"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "400b347fe65ccfbd8f545c9d9a75d04b0caf23fec49aaa838a9a05398f94c019"
-dependencies = [
- "regex 0.2.11",
+ "subtle",
 ]
 
 [[package]]
@@ -1293,24 +1164,25 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.11"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
 
 [[package]]
 name = "ed25519"
-version = "1.5.3"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
- "signature",
+ "pkcs8 0.10.2",
+ "signature 2.1.0",
 ]
 
 [[package]]
@@ -1324,18 +1196,30 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
- "curve25519-dalek 3.2.0",
+ "curve25519-dalek 4.1.1",
  "ed25519",
- "rand 0.7.3",
+ "rand_core 0.6.4",
  "serde",
- "sha2 0.9.9",
+ "sha2 0.10.6",
+ "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "ed25519-dalek-bip32"
+version = "0.3.0"
+dependencies = [
+ "derivation-path",
+ "ed25519-dalek",
+ "hex",
+ "hmac 0.12.1",
+ "sha2 0.10.6",
+]
+
 [[package]]
 name = "ed25519-zebra"
 version = "3.1.0"
@@ -1343,8 +1227,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
 dependencies = [
  "curve25519-dalek 3.2.0",
- "hashbrown",
- "hex 0.4.3",
+ "hashbrown 0.12.3",
+ "hex",
  "rand_core 0.6.4",
  "sha2 0.9.9",
  "zeroize",
@@ -1352,9 +1236,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "environmental"
@@ -1363,24 +1247,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
 
 [[package]]
-name = "errno"
-version = "0.3.0"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.45.0",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1393,14 +1272,14 @@ dependencies = [
  "fixed-hash",
  "impl-rlp",
  "impl-serde",
- "tiny-keccak 2.0.2",
+ "tiny-keccak",
 ]
 
 [[package]]
 name = "ethereum-types"
-version = "0.14.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+checksum = "81224dc661606574f5a0f28c9947d0ee1d93ff11c5f1c4e7272f52e8c0b5483c"
 dependencies = [
  "ethbloom",
  "fixed-hash",
@@ -1426,8 +1305,8 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
  "synstructure",
 ]
@@ -1447,32 +1326,6 @@ dependencies = [
  "instant",
 ]
 
-[[package]]
-name = "ff_ce"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38107cbd8bac0d907d7e7513c9f68c95adbda9e6f6f6bdf3f5111c6ecac4fe47"
-dependencies = [
- "byteorder 1.4.3",
- "ff_derive_ce",
- "hex 0.4.3",
- "rand 0.4.6",
-]
-
-[[package]]
-name = "ff_derive_ce"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde5a00073374b4d7aa2d3a8359a5709f9c0bfac8393f254655d16b4acdfe823"
-dependencies = [
- "num-bigint 0.4.3",
- "num-integer",
- "num-traits",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "fff"
 version = "0.2.3"
@@ -1481,24 +1334,15 @@ checksum = "2544d325b4870bd803d371a7df3c6845e84dcfcb6ebe7ffcae0eac6d5d676133"
 dependencies = [
  "byteorder 1.4.3",
  "cc",
- "fff_derive",
  "lazy_static",
  "rand_core 0.5.1",
 ]
 
 [[package]]
-name = "fff_derive"
-version = "0.2.2"
+name = "fiat-crypto"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "844b389fbe323d3b35ed1b3b119e75b11dca536d291d31342acea5b4c8984558"
-dependencies = [
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
-]
+checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
 
 [[package]]
 name = "fixed-hash"
@@ -1512,12 +1356,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "fixedbitset"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
-
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1597,24 +1435,8 @@ dependencies = [
  "generic-array 0.14.7",
  "integer-encoding",
  "multibase 0.9.1",
- "multihash",
- "serde",
-]
-
-[[package]]
-name = "forest_crypto"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40035f5bb36362e9b6200ecdc11a1008169f1d60a01dcd9e1000a808f86cae6f"
-dependencies = [
- "bls-signatures 0.6.1",
- "forest_address",
- "forest_encoding",
- "libsecp256k1 0.3.5",
- "num-derive",
- "num-traits",
+ "multihash 0.13.2",
  "serde",
- "thiserror",
 ]
 
 [[package]]
@@ -1623,7 +1445,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecfe12e10b7f6aa5643dcde74533d8192720ab7366ce473ff4043c71b5132c27"
 dependencies = [
- "bls-signatures 0.9.0",
+ "bls-signatures",
  "forest_address",
  "forest_encoding",
  "libsecp256k1 0.6.0",
@@ -1658,23 +1480,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "forest_message"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4935036b1da07044b4c50cc7c228517be74f12a66fbbc6661c6f359a05f1dc74"
-dependencies = [
- "derive_builder",
- "forest_address",
- "forest_bigint",
- "forest_cid",
- "forest_crypto 0.4.1",
- "forest_encoding",
- "forest_vm",
- "num-traits",
- "serde",
-]
-
 [[package]]
 name = "forest_message"
 version = "0.7.2"
@@ -1685,7 +1490,7 @@ dependencies = [
  "forest_address",
  "forest_bigint",
  "forest_cid",
- "forest_crypto 0.5.3",
+ "forest_crypto",
  "forest_encoding",
  "forest_vm",
  "num-traits",
@@ -1715,39 +1520,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
-[[package]]
-name = "franklin-crypto"
-version = "0.0.5"
-source = "git+https://github.com/matter-labs/franklin-crypto.git?branch=beta#6e448d23161eacabb9465dc3181b7b15174cda2f"
-dependencies = [
- "bellman_ce",
- "bit-vec",
- "blake2 0.9.2",
- "blake2-rfc_bellman_edition",
- "blake2s_simd",
- "byteorder 1.4.3",
- "digest 0.9.0",
- "hex 0.4.3",
- "hmac 0.11.0",
- "itertools 0.9.0",
- "num-bigint 0.3.3",
- "num-integer",
- "num-traits",
- "poseidon_hash",
- "rand 0.4.6",
- "serde",
- "serde_derive",
- "sha2 0.9.9",
- "splitmut",
- "tiny-keccak 1.5.0",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1756,15 +1528,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1777,9 +1543,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1787,15 +1553,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1805,38 +1571,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1875,7 +1641,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
@@ -1884,20 +1650,20 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.27.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "glob"
@@ -1919,11 +1685,11 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.16"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -1967,13 +1733,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "heck"
-version = "0.3.3"
+name = "hashbrown"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "heck"
@@ -1983,24 +1746,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-
-[[package]]
-name = "hex"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -2016,9 +1764,9 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
 [[package]]
 name = "hidapi"
-version = "2.2.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4255d387f1961f1d469ef24acc5620d4b1b15a7b763b759d9b29f095164ee27"
+checksum = "29839436a2de4587be0b5ef083492a5dcee40ac98404e63410dc98c916251ca7"
 dependencies = [
  "cc",
  "libc",
@@ -2026,16 +1774,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "hkdf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fa08a006102488bd9cd5b8013aabe84955cf5ae22e304c2caf655b633aefae3"
-dependencies = [
- "digest 0.8.1",
- "hmac 0.7.1",
-]
-
 [[package]]
 name = "hkdf"
 version = "0.12.3"
@@ -2045,16 +1783,6 @@ dependencies = [
  "hmac 0.12.1",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
-dependencies = [
- "crypto-mac 0.7.0",
- "digest 0.8.1",
-]
-
 [[package]]
 name = "hmac"
 version = "0.8.1"
@@ -2065,16 +1793,6 @@ dependencies = [
  "digest 0.9.0",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff"
-dependencies = [
- "crypto-mac 0.9.1",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "hmac"
 version = "0.11.0"
@@ -2094,17 +1812,6 @@ dependencies = [
  "digest 0.10.6",
 ]
 
-[[package]]
-name = "hmac-drbg"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
-dependencies = [
- "digest 0.8.1",
- "generic-array 0.12.4",
- "hmac 0.7.1",
-]
-
 [[package]]
 name = "hmac-drbg"
 version = "0.3.0"
@@ -2116,24 +1823,30 @@ dependencies = [
  "hmac 0.8.1",
 ]
 
+[[package]]
+name = "hmac-sha256"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc736091aacb31ddaa4cd5f6988b3c21e99913ac846b41f32538c5fae5d71bfe"
+
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "fnv",
  "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "http",
  "pin-project-lite",
 ]
@@ -2146,17 +1859,17 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.25"
+version = "0.14.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -2192,13 +1905,36 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "hyper",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -2209,9 +1945,10 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 name = "ikc"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base64 0.13.1",
  "bitcoin",
- "bytes 1.4.0",
+ "bytes",
  "coin-bch",
  "coin-bitcoin",
  "coin-btc-fork",
@@ -2224,8 +1961,7 @@ dependencies = [
  "coin-tezos",
  "coin-tron",
  "ethereum-types",
- "failure",
- "hex 0.4.3",
+ "hex",
  "ikc-common",
  "ikc-device",
  "ikc-transport",
@@ -2233,8 +1969,8 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parking_lot",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
  "serde_json",
 ]
 
@@ -2242,13 +1978,14 @@ dependencies = [
 name = "ikc-common"
 version = "0.1.0"
 dependencies = [
- "aes-ctr",
- "aes-soft",
+ "aes",
+ "anyhow",
+ "base64 0.13.1",
  "bitcoin",
- "block-modes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "byteorder 1.4.3",
+ "bytes",
+ "cbc",
+ "hex",
  "hyper",
  "hyper-timeout",
  "hyper-tls",
@@ -2257,15 +1994,15 @@ dependencies = [
  "num-integer",
  "num-traits",
  "parking_lot",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "regex 1.7.3",
- "ring",
+ "prost",
+ "prost-types",
+ "regex",
  "rustc-serialize",
  "secp256k1",
  "serde",
  "serde_derive",
  "serde_json",
+ "thiserror",
  "tokio",
 ]
 
@@ -2273,51 +2010,49 @@ dependencies = [
 name = "ikc-device"
 version = "0.1.0"
 dependencies = [
- "aes-ctr",
- "aes-soft",
+ "anyhow",
  "base64 0.13.1",
- "block-modes",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "ikc-common",
  "ikc-transport",
  "lazy_static",
  "log",
  "parking_lot",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
  "rand 0.8.5",
- "regex 1.7.3",
- "ring",
+ "regex",
  "rsa",
  "secp256k1",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
+ "thiserror",
 ]
 
 [[package]]
 name = "ikc-proto"
 version = "0.1.0"
 dependencies = [
- "bytes 1.4.0",
- "prost 0.11.8",
- "prost-build 0.6.1",
- "prost-types 0.5.0",
+ "bytes",
+ "prost",
+ "prost-build",
+ "prost-types",
 ]
 
 [[package]]
 name = "ikc-transport"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "cargo-husky",
- "failure",
- "hex 0.4.3",
+ "hex",
  "hidapi",
  "lazy_static",
  "parking_lot",
+ "thiserror",
 ]
 
 [[package]]
@@ -2353,19 +2088,19 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.9.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
- "autocfg",
- "hashbrown",
+ "equivalent",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -2374,6 +2109,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
+ "block-padding 0.3.3",
  "generic-array 0.14.7",
 ]
 
@@ -2383,7 +2119,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -2403,87 +2139,35 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "iop-keyvault"
-version = "0.0.5"
+name = "itertools"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce717766464892e71516a8960818a0233ef6d70f324985763e85fe58cb94bfc"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
- "anyhow",
- "blake2 0.9.2",
- "digest 0.9.0",
- "ed25519-dalek",
- "failure",
- "getrandom 0.1.16",
- "hex 0.4.3",
- "hmac 0.9.0",
- "libsecp256k1 0.3.5",
- "multibase 0.8.0",
- "orion",
- "rand 0.7.3",
- "ripemd160",
- "serde",
- "serde_bytes",
- "sha2 0.9.9",
- "tiny-bip39 0.7.3",
+ "either",
 ]
 
 [[package]]
-name = "iovec"
-version = "0.1.4"
+name = "itoa"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itertools"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.37"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2494,7 +2178,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "futures 0.3.27",
+ "futures",
  "futures-executor",
  "futures-util",
  "log",
@@ -2505,9 +2189,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
@@ -2519,7 +2203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c"
 dependencies = [
  "primitive-types",
- "tiny-keccak 2.0.2",
+ "tiny-keccak",
 ]
 
 [[package]]
@@ -2545,25 +2229,9 @@ checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
 
 [[package]]
 name = "libm"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
-
-[[package]]
-name = "libsecp256k1"
-version = "0.3.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
-dependencies = [
- "arrayref",
- "crunchy",
- "digest 0.8.1",
- "hmac-drbg 0.2.0",
- "rand 0.7.3",
- "sha2 0.8.2",
- "subtle 2.4.1",
- "typenum",
-]
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libsecp256k1"
@@ -2574,7 +2242,7 @@ dependencies = [
  "arrayref",
  "base64 0.12.3",
  "digest 0.9.0",
- "hmac-drbg 0.3.0",
+ "hmac-drbg",
  "libsecp256k1-core 0.2.2",
  "libsecp256k1-gen-ecmult 0.2.1",
  "libsecp256k1-gen-genmult 0.2.1",
@@ -2593,7 +2261,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.1",
  "digest 0.9.0",
- "hmac-drbg 0.3.0",
+ "hmac-drbg",
  "libsecp256k1-core 0.3.0",
  "libsecp256k1-gen-ecmult 0.3.0",
  "libsecp256k1-gen-genmult 0.3.0",
@@ -2611,7 +2279,7 @@ checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.4.1",
+ "subtle",
 ]
 
 [[package]]
@@ -2622,7 +2290,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.4.1",
+ "subtle",
 ]
 
 [[package]]
@@ -2672,15 +2340,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.0"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2692,7 +2360,7 @@ version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -2701,7 +2369,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -2710,33 +2378,14 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
 dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "mathru"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7584d97fddf282cc3e5cc6fae54e596cfcd708a3b375633294d9db8e8b6d776"
-dependencies = [
- "rand 0.7.3",
- "serde",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.8.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memory-db"
@@ -2745,7 +2394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269"
 dependencies = [
  "hash-db",
- "hashbrown",
+ "hashbrown 0.12.3",
  "parity-util-mem",
 ]
 
@@ -2778,23 +2427,22 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "mockall"
-version = "0.11.4"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
+checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "downcast",
  "fragile",
  "lazy_static",
@@ -2805,13 +2453,13 @@ dependencies = [
 
 [[package]]
 name = "mockall_derive"
-version = "0.11.4"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
+checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0"
 dependencies = [
- "cfg-if 1.0.0",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "cfg-if",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -2845,8 +2493,25 @@ checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab"
 dependencies = [
  "blake2b_simd 0.5.11",
  "generic-array 0.14.7",
- "multihash-derive",
- "unsigned-varint",
+ "multihash-derive 0.7.2",
+ "unsigned-varint 0.5.1",
+]
+
+[[package]]
+name = "multihash"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815"
+dependencies = [
+ "blake2b_simd 1.0.1",
+ "blake2s_simd",
+ "blake3",
+ "core2",
+ "digest 0.10.6",
+ "multihash-derive 0.8.1",
+ "sha2 0.10.6",
+ "sha3",
+ "unsigned-varint 0.7.2",
 ]
 
 [[package]]
@@ -2855,10 +2520,24 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.1.3",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[package]]
+name = "multihash-derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
+dependencies = [
+ "proc-macro-crate 1.1.3",
  "proc-macro-error",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
  "synstructure",
 ]
@@ -2887,12 +2566,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -2905,17 +2578,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.3.3"
@@ -2940,9 +2602,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
 dependencies = [
  "byteorder 1.4.3",
  "lazy_static",
@@ -2955,24 +2617,14 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
 [[package]]
 name = "num-derive"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -2982,7 +2634,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "itoa",
 ]
 
@@ -3031,31 +2683,28 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "object"
-version = "0.30.3"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
-dependencies = [
- "parking_lot_core",
-]
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
@@ -3071,12 +2720,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.48"
+version = "0.10.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
+checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
 dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
+ "bitflags 2.4.1",
+ "cfg-if",
  "foreign-types",
  "libc",
  "once_cell",
@@ -3086,13 +2735,13 @@ dependencies = [
 
 [[package]]
 name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3103,66 +2752,26 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.83"
+version = "0.9.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
+checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
 dependencies = [
- "autocfg",
  "cc",
  "libc",
  "pkg-config",
  "vcpkg",
 ]
 
-[[package]]
-name = "orion"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ee35b1dab594706a44b4e48045ebcb699f688dfb25c168fcd1642b5e2bc2be"
-dependencies = [
- "base64 0.13.1",
- "getrandom 0.2.8",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "paired"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ae957e986289a03f1407ce9c88f19e8280e8106d5498a364e3e5b60b1b9fc"
-dependencies = [
- "blake2b_simd 0.5.11",
- "byteorder 1.4.3",
- "digest 0.8.1",
- "fff",
- "groupy",
- "hkdf 0.8.0",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "pairing_ce"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e753515675eaaa98071d814bea0148ae8c9d7995fa0531bf222e7857e3f1759"
-dependencies = [
- "byteorder 1.4.3",
- "cfg-if 1.0.0",
- "ff_ce",
- "rand 0.4.6",
-]
-
 [[package]]
 name = "parity-scale-codec"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac"
+checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "bitvec",
  "byte-slice-cast",
- "bytes 1.4.0",
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
  "serde",
@@ -3170,13 +2779,13 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.1.4"
+version = "3.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro-crate 2.0.0",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -3186,8 +2795,8 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8"
 dependencies = [
- "cfg-if 1.0.0",
- "hashbrown",
+ "cfg-if",
+ "hashbrown 0.12.3",
  "impl-trait-for-tuples",
  "parity-util-mem-derive",
  "parking_lot",
@@ -3201,7 +2810,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
 dependencies = [
- "proc-macro2 1.0.54",
+ "proc-macro2",
  "syn 1.0.109",
  "synstructure",
 ]
@@ -3224,15 +2833,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.4.1",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3243,24 +2852,14 @@ checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
 dependencies = [
  "base64ct",
  "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
-
-[[package]]
-name = "pbkdf2"
-version = "0.3.0"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
-dependencies = [
- "byteorder 1.4.3",
- "crypto-mac 0.7.0",
-]
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pbkdf2"
@@ -3303,29 +2902,19 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
-dependencies = [
- "fixedbitset 0.2.0",
- "indexmap",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
- "fixedbitset 0.4.2",
+ "fixedbitset",
  "indexmap",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -3339,9 +2928,9 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
 dependencies = [
- "der",
- "pkcs8",
- "spki",
+ "der 0.6.1",
+ "pkcs8 0.9.0",
+ "spki 0.6.0",
  "zeroize",
 ]
 
@@ -3351,15 +2940,31 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
- "der",
- "spki",
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.8",
+ "spki 0.7.3",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
+
+[[package]]
+name = "platforms"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 
 [[package]]
 name = "poly1305"
@@ -3372,25 +2977,6 @@ dependencies = [
  "universal-hash",
 ]
 
-[[package]]
-name = "poseidon_hash"
-version = "0.0.1"
-source = "git+https://github.com/shamatar/poseidon_hash.git#495ae87ff066d066b140c7d0dff8d929b87d31ee"
-dependencies = [
- "alga",
- "approx",
- "blake2-rfc_bellman_edition",
- "byteorder 1.4.3",
- "mathru",
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits",
- "pairing_ce",
- "rand 0.4.6",
- "sha2 0.8.2",
- "tiny-keccak 1.5.0",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -3405,10 +2991,10 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
 dependencies = [
  "difflib",
  "float-cmp",
- "itertools 0.10.5",
+ "itertools",
  "normalize-line-endings",
  "predicates-core",
- "regex 1.7.3",
+ "regex",
 ]
 
 [[package]]
@@ -3433,15 +3019,15 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
- "proc-macro2 1.0.54",
+ "proc-macro2",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "primitive-types"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -3453,11 +3039,20 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+dependencies = [
+ "thiserror",
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "once_cell",
  "toml_edit",
 ]
 
@@ -3468,8 +3063,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
  "version_check",
 ]
@@ -3480,184 +3075,82 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "version_check",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.54"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prost"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d14b1c185652833d24aaad41c5832b0be5616a590227c1fbff57c616754b23"
-dependencies = [
- "byteorder 1.4.3",
- "bytes 0.4.12",
- "prost-derive 0.5.0",
-]
-
-[[package]]
-name = "prost"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
-dependencies = [
- "bytes 0.5.6",
- "prost-derive 0.6.1",
-]
-
-[[package]]
-name = "prost"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537"
-dependencies = [
- "bytes 1.4.0",
- "prost-derive 0.11.8",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.6.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26"
+checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a"
 dependencies = [
- "bytes 0.5.6",
- "heck 0.3.3",
- "itertools 0.8.2",
- "log",
- "multimap",
- "petgraph 0.5.1",
- "prost 0.6.1",
- "prost-types 0.6.1",
- "tempfile",
- "which 3.1.1",
+ "bytes",
+ "prost-derive",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.11.8"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12"
+checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94"
 dependencies = [
- "bytes 1.4.0",
- "heck 0.4.1",
- "itertools 0.10.5",
+ "bytes",
+ "heck",
+ "itertools",
  "lazy_static",
  "log",
  "multimap",
- "petgraph 0.6.3",
+ "petgraph",
  "prettyplease",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "regex 1.7.3",
+ "prost",
+ "prost-types",
+ "regex",
  "syn 1.0.109",
  "tempfile",
- "which 4.4.0",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e7dc378b94ac374644181a2247cebf59a6ec1c88b49ac77f3a94b86b79d0e11"
-dependencies = [
- "failure",
- "itertools 0.8.2",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
+ "which",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
-dependencies = [
- "anyhow",
- "itertools 0.8.2",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "itertools",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.5.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de482a366941c8d56d19b650fac09ca08508f2a696119ee7513ad590c8bac6f"
+checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a"
 dependencies = [
- "bytes 0.4.12",
- "prost 0.5.0",
+ "bytes",
+ "prost",
 ]
 
 [[package]]
-name = "prost-types"
-version = "0.6.1"
+name = "quote"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
- "bytes 0.5.6",
- "prost 0.6.1",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88"
-dependencies = [
- "prost 0.11.8",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
-dependencies = [
- "proc-macro2 1.0.54",
+ "proc-macro2",
 ]
 
 [[package]]
@@ -3666,19 +3159,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -3724,21 +3204,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -3754,7 +3219,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
 ]
 
 [[package]]
@@ -3784,108 +3249,54 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "7.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41"
-dependencies = [
- "bitflags",
- "cc",
- "rustc_version",
-]
-
-[[package]]
-name = "rayon"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.16"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c"
+checksum = "53313ec9f12686aeeffb43462c3ac77aa25f590a5f630eb2cde0de59417b29c7"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7"
-dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
-]
-
-[[package]]
-name = "regex"
-version = "0.2.11"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
+checksum = "2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4"
 dependencies = [
- "aho-corasick 0.6.10",
- "memchr",
- "regex-syntax 0.5.6",
- "thread_local 0.3.6",
- "utf8-ranges",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.3"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.6.29",
+ "regex-automata 0.3.9",
+ "regex-syntax 0.7.5",
 ]
 
 [[package]]
@@ -3898,12 +3309,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "regex-syntax"
-version = "0.5.6"
+name = "regex-automata"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
 dependencies = [
- "ucd-util",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.5",
 ]
 
 [[package]]
@@ -3913,30 +3326,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
+name = "regex-syntax"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "rlp"
@@ -3944,7 +3337,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "rustc-hex",
 ]
 
@@ -3961,19 +3354,19 @@ dependencies = [
  "num-iter",
  "num-traits",
  "pkcs1",
- "pkcs8",
+ "pkcs8 0.9.0",
  "rand_core 0.6.4",
- "signature",
+ "signature 1.6.4",
  "smallvec",
- "subtle 2.4.1",
+ "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -3995,20 +3388,20 @@ checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 
 [[package]]
 name = "rustc_version"
-version = "0.2.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.37.5"
+version = "0.37.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75"
+checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
@@ -4018,15 +3411,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "salsa20"
@@ -4034,17 +3427,17 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
 name = "scale-info"
-version = "2.5.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
 dependencies = [
  "bitvec",
- "cfg-if 1.0.0",
+ "cfg-if",
  "derive_more",
  "parity-scale-codec",
  "scale-info-derive",
@@ -4052,23 +3445,23 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.5.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4085,21 +3478,15 @@ dependencies = [
  "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
- "subtle 2.4.1",
+ "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrypt"
@@ -4144,11 +3531,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -4157,9 +3544,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4167,63 +3554,35 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
 dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde_bytes"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.95"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
 dependencies = [
  "itoa",
  "ryu",
@@ -4232,13 +3591,13 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.12"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4257,11 +3616,36 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "serial_test"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
+dependencies = [
+ "dashmap",
+ "futures",
+ "lazy_static",
+ "log",
+ "parking_lot",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.1"
@@ -4296,7 +3680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
@@ -4308,30 +3692,16 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.6",
 ]
 
-[[package]]
-name = "sha2ni"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce234f44a9c36fb84a168d4201b596d800e170aaa966a68857058cbe2d041a3"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "lazy_static",
- "opaque-debug 0.2.3",
- "raw-cpuid",
-]
-
 [[package]]
 name = "sha3"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
  "digest 0.10.6",
  "keccak",
@@ -4339,9 +3709,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -4365,20 +3735,26 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "socket2"
@@ -4428,12 +3804,12 @@ checksum = "88c78530907dbf7949af928d0ce88b485067389201b6d9b468074b1924f209f0"
 dependencies = [
  "array-bytes",
  "base58",
- "bitflags",
- "blake2 0.10.6",
+ "bitflags 1.3.2",
+ "blake2",
  "byteorder 1.4.3",
  "dyn-clonable",
  "ed25519-zebra",
- "futures 0.3.27",
+ "futures",
  "hash-db",
  "hash256-std-hasher",
  "impl-serde",
@@ -4446,7 +3822,7 @@ dependencies = [
  "parking_lot",
  "primitive-types",
  "rand 0.7.3",
- "regex 1.7.3",
+ "regex",
  "scale-info",
  "schnorrkel",
  "secp256k1",
@@ -4472,7 +3848,7 @@ version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a"
 dependencies = [
- "blake2 0.10.6",
+ "blake2",
  "byteorder 1.4.3",
  "digest 0.10.6",
  "sha2 0.10.6",
@@ -4487,8 +3863,8 @@ version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9e9ba7352773b96a4aa57e903447f841c6bc26e8c798377db6e7eb332346454"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4510,8 +3886,8 @@ version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6280bd3643354f7ff0b2abd36c687745455779231a7a86d90945608f0d4924c4"
 dependencies = [
- "bytes 1.4.0",
- "futures 0.3.27",
+ "bytes",
+ "futures",
  "hash-db",
  "libsecp256k1 0.7.1",
  "log",
@@ -4540,7 +3916,7 @@ dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum",
+ "strum 0.24.1",
 ]
 
 [[package]]
@@ -4550,7 +3926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44bec4f0d036b6993c14bbee4216781f21275e5c201e43e45fed4a434bf0e5a"
 dependencies = [
  "async-trait",
- "futures 0.3.27",
+ "futures",
  "merlin",
  "parity-scale-codec",
  "parking_lot",
@@ -4568,7 +3944,7 @@ checksum = "97549ec99cb289db2a9f5c656b6880f7c90097135e1ca6c6ae4fe5694232e526"
 dependencies = [
  "backtrace",
  "lazy_static",
- "regex 1.7.3",
+ "regex",
 ]
 
 [[package]]
@@ -4601,7 +3977,7 @@ version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b886a5d34400b0e0c12d389e3bb48b7a93d651cddf7e248124b81fe64c339251"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types",
@@ -4621,9 +3997,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a157f1ce0108b9b87f87e826726049d9b6253318b74410c814be7fc2af416b51"
 dependencies = [
  "Inflector",
- "proc-macro-crate",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4691,7 +4067,7 @@ checksum = "2f4f48c887e90050537e399d2d8b6ee82787ebec0fe46e4880b42cab0c2d5ba6"
 dependencies = [
  "ahash",
  "hash-db",
- "hashbrown",
+ "hashbrown 0.12.3",
  "lazy_static",
  "lru",
  "memory-db",
@@ -4750,28 +4126,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
  "base64ct",
- "der",
+ "der 0.6.1",
 ]
 
 [[package]]
-name = "splitmut"
-version = "0.2.1"
+name = "spki"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85070f382340e8b23a75808e83573ddf65f9ad9143df9573ca37c1ed2ee956a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.8",
+]
 
 [[package]]
 name = "ss58-registry"
-version = "1.39.0"
+version = "1.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecf0bd63593ef78eca595a7fc25e9a443ca46fe69fd472f8f09f5245cdcd769d"
+checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1"
 dependencies = [
  "Inflector",
  "num-format",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "serde",
  "serde_json",
- "unicode-xid 0.2.4",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -4781,7 +4161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f923762d556417668b192ac2fdc9827ea21e6df011d8a0a7e68f3d5da095a675"
 dependencies = [
  "bitvec",
- "hex 0.4.3",
+ "hex",
  "num-bigint 0.4.3",
  "serde",
  "sha2 0.9.9",
@@ -4795,8 +4175,8 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c679ebd9c1ceeb0f9e5b839952b4a71bfe35a791b431ef7b3ee0b71b7588b565"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4818,7 +4198,16 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.24.3",
+]
+
+[[package]]
+name = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+dependencies = [
+ "strum_macros 0.25.3",
 ]
 
 [[package]]
@@ -4827,18 +4216,31 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "heck",
+ "proc-macro2",
+ "quote",
  "rustversion",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "substrate-bip39"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c"
+checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328"
 dependencies = [
  "hmac 0.11.0",
  "pbkdf2 0.8.0",
@@ -4847,48 +4249,31 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.11"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "unicode-ident",
 ]
 
@@ -4898,10 +4283,10 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
+ "proc-macro2",
+ "quote",
  "syn 1.0.109",
- "unicode-xid 0.2.4",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -4914,106 +4299,89 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 name = "tcx"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base58",
  "base64 0.13.1",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "ethereum-types",
+ "hex",
  "lazy_static",
  "libc",
  "log",
  "parking_lot",
- "prost 0.11.8",
- "prost-build 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-build",
+ "prost-types",
  "serde",
  "serde_json",
+ "serial_test",
  "sp-core",
  "sp-runtime",
- "tcx-bch",
- "tcx-btc-fork",
- "tcx-chain",
+ "strum 0.25.0",
+ "tcx-atom",
+ "tcx-btc-kin",
  "tcx-ckb",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-eos",
+ "tcx-eth",
  "tcx-eth2",
  "tcx-filecoin",
+ "tcx-keystore",
+ "tcx-migration",
  "tcx-primitive",
  "tcx-proto",
  "tcx-substrate",
  "tcx-tezos",
  "tcx-tron",
- "zksync-crypto",
 ]
 
 [[package]]
-name = "tcx-bch"
+name = "tcx-atom"
 version = "0.1.0"
 dependencies = [
- "bch_addr",
- "bitcoin",
- "bitcoin_hashes",
- "failure",
- "hex 0.4.3",
- "secp256k1",
- "serde",
- "serde_json",
- "tcx-btc-fork",
- "tcx-chain",
+ "anyhow",
+ "base64 0.13.1",
+ "bech32 0.9.1",
+ "bytes",
+ "prost",
+ "tcx-common",
  "tcx-constants",
+ "tcx-crypto",
+ "tcx-keystore",
  "tcx-primitive",
- "tiny-bip39 0.7.3",
 ]
 
 [[package]]
-name = "tcx-btc-fork"
+name = "tcx-btc-kin"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base64 0.13.1",
+ "bch_addr",
  "bech32 0.9.1",
  "bitcoin",
  "bitcoin_hashes",
  "byteorder 1.4.3",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "mockall",
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "secp256k1",
- "serde",
- "serde_json",
- "tcx-chain",
- "tcx-constants",
- "tcx-crypto",
- "tcx-primitive",
- "tiny-bip39 0.7.3",
- "uuid",
-]
-
-[[package]]
-name = "tcx-chain"
-version = "0.1.0"
-dependencies = [
- "bitcoin",
- "bitcoin_hashes",
- "byteorder 1.4.3",
- "bytes 1.4.0",
- "cargo-husky",
- "failure",
- "hex 0.4.3",
- "prost 0.11.8",
- "regex 1.7.3",
+ "prost",
+ "prost-types",
  "secp256k1",
  "serde",
  "serde_json",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-keystore",
  "tcx-primitive",
- "tiny-bip39 0.7.3",
+ "thiserror",
+ "tiny-bip39 1.0.0",
  "uuid",
 ]
 
@@ -5021,110 +4389,235 @@ dependencies = [
 name = "tcx-ckb"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bech32 0.9.1",
  "blake2b-rs",
  "byteorder 1.4.3",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
+ "hex",
  "lazy_static",
- "prost 0.11.8",
- "tcx-chain",
+ "prost",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-keystore",
  "tcx-primitive",
+ "thiserror",
 ]
 
 [[package]]
-name = "tcx-constants"
+name = "tcx-common"
 version = "0.1.0"
 dependencies = [
- "failure",
- "lazy_static",
- "parking_lot",
- "serde",
- "serde_json",
-]
-
+ "aes",
+ "anyhow",
+ "bitcoin",
+ "ctr",
+ "ethereum-types",
+ "hex",
+ "keccak-hash",
+ "rand 0.8.5",
+ "regex",
+ "secp256k1",
+ "thiserror",
+ "tiny-bip39 1.0.0",
+]
+
+[[package]]
+name = "tcx-constants"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "tcx-common",
+]
+
 [[package]]
 name = "tcx-crypto"
 version = "0.1.0"
 dependencies = [
- "aes-ctr",
- "aes-soft",
+ "aes",
+ "anyhow",
  "bitcoin_hashes",
- "block-modes",
+ "cbc",
  "crypto-mac 0.11.1",
+ "ctr",
  "digest 0.10.6",
- "failure",
- "hex 0.4.3",
+ "hex",
  "hmac 0.12.1",
  "lazy_static",
  "parking_lot",
  "pbkdf2 0.11.0",
  "rand 0.8.5",
+ "regex",
  "scrypt",
  "secp256k1",
  "serde",
  "serde_json",
  "sha2 0.10.6",
+ "tcx-common",
+ "tcx-constants",
+ "thiserror",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "tcx-eos"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base64 0.13.1",
+ "bitcoin",
+ "bytes",
+ "prost",
+ "regex",
+ "tcx-common",
+ "tcx-constants",
+ "tcx-crypto",
+ "tcx-keystore",
+ "tcx-primitive",
+]
+
+[[package]]
+name = "tcx-eth"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "ethereum-types",
+ "hex",
+ "prost",
+ "prost-types",
+ "regex",
+ "rlp",
+ "secp256k1",
+ "tcx-common",
  "tcx-constants",
- "tiny-keccak 2.0.2",
+ "tcx-keystore",
+ "tcx-primitive",
 ]
 
 [[package]]
 name = "tcx-eth2"
 version = "0.1.0"
 dependencies = [
- "bytes 1.4.0",
- "failure",
- "hex 0.3.2",
+ "anyhow",
+ "bytes",
  "keccak-hash",
  "lazy_static",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "regex 1.7.3",
+ "prost",
+ "prost-types",
+ "regex",
  "ssz_rs",
  "ssz_rs_derive",
- "tcx-chain",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-eth",
+ "tcx-keystore",
  "tcx-primitive",
+ "thiserror",
 ]
 
 [[package]]
 name = "tcx-filecoin"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base32",
  "base64 0.13.1",
  "blake2b-rs",
  "byteorder 1.4.3",
- "bytes 1.4.0",
- "failure",
+ "bytes",
  "forest_address",
- "forest_bigint",
  "forest_cid",
- "forest_crypto 0.5.3",
+ "forest_crypto",
  "forest_encoding",
- "forest_message 0.7.2",
+ "forest_message",
  "forest_vm",
- "hex 0.4.3",
  "lazy_static",
- "prost 0.11.8",
+ "prost",
+ "serde",
+ "serde_json",
+ "tcx-common",
+ "tcx-constants",
+ "tcx-crypto",
+ "tcx-keystore",
+ "tcx-primitive",
+ "thiserror",
+]
+
+[[package]]
+name = "tcx-keystore"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bitcoin",
+ "bitcoin_hashes",
+ "byteorder 1.4.3",
+ "bytes",
+ "cargo-husky",
+ "hex",
+ "hmac-sha256",
+ "lazy_static",
+ "multihash 0.18.1",
+ "parking_lot",
+ "prost",
+ "regex",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "sha2 0.10.6",
+ "tcx-common",
+ "tcx-constants",
+ "tcx-crypto",
+ "tcx-primitive",
+ "thiserror",
+ "tiny-bip39 1.0.0",
+ "uuid",
+]
+
+[[package]]
+name = "tcx-migration"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base58",
+ "base64 0.13.1",
+ "bytes",
+ "hex",
+ "lazy_static",
+ "libc",
+ "log",
+ "parking_lot",
+ "prost",
+ "prost-types",
  "serde",
- "serde_cbor",
  "serde_json",
- "tcx-chain",
+ "tcx-atom",
+ "tcx-btc-kin",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-eos",
+ "tcx-eth",
+ "tcx-filecoin",
+ "tcx-keystore",
  "tcx-primitive",
+ "tcx-proto",
+ "tcx-substrate",
+ "tcx-tezos",
+ "tcx-tron",
+ "uuid",
 ]
 
 [[package]]
 name = "tcx-primitive"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
  "bitcoin_hashes",
  "blake2b_simd 1.0.1",
@@ -5132,61 +4625,64 @@ dependencies = [
  "byteorder 1.4.3",
  "digest 0.10.6",
  "ed25519-bip32",
- "failure",
- "hex 0.4.3",
+ "ed25519-dalek",
+ "ed25519-dalek-bip32",
+ "hex",
  "hex-literal",
- "hkdf 0.12.3",
- "iop-keyvault",
+ "hkdf",
  "lazy_static",
  "num-bigint 0.4.3",
  "num-traits",
- "regex 1.7.3",
+ "regex",
  "schnorrkel",
  "secp256k1",
  "serde",
  "serde_json",
  "sha2 0.10.6",
  "sp-core",
+ "tcx-common",
  "tcx-constants",
- "tiny-bip39 0.7.3",
+ "thiserror",
+ "tiny-bip39 1.0.0",
 ]
 
 [[package]]
 name = "tcx-proto"
 version = "0.1.0"
 dependencies = [
- "bytes 1.4.0",
- "prost 0.11.8",
- "prost-build 0.11.8",
- "prost-types 0.11.8",
+ "bytes",
+ "prost",
+ "prost-build",
+ "prost-types",
 ]
 
 [[package]]
 name = "tcx-substrate"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base58",
  "base64 0.13.1",
- "bs58 0.4.0",
  "byteorder 1.4.3",
- "bytes 1.4.0",
- "failure",
- "hex 0.4.3",
+ "bytes",
  "parity-scale-codec",
- "prost 0.11.8",
- "prost-types 0.11.8",
+ "prost",
+ "prost-types",
  "rand 0.8.5",
- "regex 1.7.3",
+ "regex",
+ "schnorrkel",
  "scrypt",
  "serde",
  "serde_json",
  "sp-core",
  "sp-keyring",
  "sp-runtime",
- "tcx-chain",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-keystore",
  "tcx-primitive",
+ "thiserror",
  "xsalsa20poly1305",
 ]
 
@@ -5194,9 +4690,9 @@ dependencies = [
 name = "tcx-tester"
 version = "0.1.0"
 dependencies = [
- "bytes 1.4.0",
- "hex 0.4.3",
- "prost 0.11.8",
+ "bytes",
+ "hex",
+ "prost",
  "tcx",
 ]
 
@@ -5204,16 +4700,17 @@ dependencies = [
 name = "tcx-tezos"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
  "blake2b_simd 1.0.1",
- "bytes 1.4.0",
- "hex 0.4.3",
- "prost 0.11.8",
- "prost-types 0.11.8",
- "ring",
- "tcx-chain",
+ "bytes",
+ "hex",
+ "prost",
+ "prost-types",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-keystore",
  "tcx-primitive",
 ]
 
@@ -5221,28 +4718,28 @@ dependencies = [
 name = "tcx-tron"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bitcoin",
  "bitcoin_hashes",
  "bytebuffer",
  "byteorder 1.4.3",
- "bytes 1.4.0",
+ "bytes",
  "digest 0.10.6",
- "failure",
- "hex 0.4.3",
+ "hex",
  "hex-literal",
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
- "prost 0.11.8",
+ "prost",
  "secp256k1",
  "serde",
  "serde_json",
- "sha3",
- "tcx-chain",
+ "tcx-common",
  "tcx-constants",
  "tcx-crypto",
+ "tcx-keystore",
  "tcx-primitive",
- "tiny-bip39 0.7.3",
+ "tiny-bip39 1.0.0",
  "uuid",
 ]
 
@@ -5252,7 +4749,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
  "rustix",
@@ -5267,31 +4764,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
-dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.3.6"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
- "lazy_static",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5300,7 +4788,7 @@ version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -5313,22 +4801,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "tiny-bip39"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
-dependencies = [
- "failure",
- "hmac 0.7.1",
- "once_cell",
- "pbkdf2 0.3.0",
- "rand 0.7.3",
- "rustc-hash",
- "sha2 0.8.2",
- "unicode-normalization",
-]
-
 [[package]]
 name = "tiny-bip39"
 version = "0.8.2"
@@ -5367,15 +4839,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "tiny-keccak"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -5402,12 +4865,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
  "autocfg",
- "bytes 1.4.0",
+ "bytes",
  "libc",
  "mio",
  "num_cpus",
@@ -5416,7 +4879,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5431,13 +4894,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5452,11 +4915,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.7"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
@@ -5464,17 +4927,26 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -5489,11 +4961,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if 1.0.0",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -5501,20 +4972,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -5522,12 +4993,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
@@ -5551,12 +5022,12 @@ dependencies = [
  "chrono",
  "lazy_static",
  "matchers",
- "regex 1.7.3",
+ "regex",
  "serde",
  "serde_json",
  "sharded-slab",
  "smallvec",
- "thread_local 1.1.7",
+ "thread_local",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -5570,7 +5041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
 dependencies = [
  "hash-db",
- "hashbrown",
+ "hashbrown 0.12.3",
  "log",
  "rustc-hex",
  "smallvec",
@@ -5587,9 +5058,9 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "twox-hash"
@@ -5597,7 +5068,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest 0.10.6",
  "rand 0.8.5",
  "static_assertions",
@@ -5605,15 +5076,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-util"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "uint"
@@ -5623,15 +5088,15 @@ checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
 dependencies = [
  "byteorder 1.4.3",
  "crunchy",
- "hex 0.4.3",
+ "hex",
  "static_assertions",
 ]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -5642,18 +5107,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -5662,12 +5115,12 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "universal-hash"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle 2.4.1",
+ "subtle",
 ]
 
 [[package]]
@@ -5677,24 +5130,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35"
 
 [[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "utf8-ranges"
-version = "1.0.5"
+name = "unsigned-varint"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
+checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
 
 [[package]]
 name = "uuid"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
  "serde",
 ]
 
@@ -5718,11 +5165,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -5740,95 +5186,57 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.60"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.60"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c"
-dependencies = [
- "cfg-if 0.1.10",
- "futures 0.1.31",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.60"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
- "quote 1.0.26",
+ "quote",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.60"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639"
-
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d9693b63a742d481c7f80587e057920e568317b2806988c59cd71618bc26c1"
-dependencies = [
- "console_error_panic_hook",
- "futures 0.1.31",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.2.50"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0789dac148a8840bbcf9efe13905463b733fa96543bfbf263790535c11af7ba5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
-]
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "wasmi"
@@ -5863,37 +5271,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "web-sys"
-version = "0.3.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
-[[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "which"
 version = "4.4.0"
@@ -5928,18 +5305,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-core"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5948,7 +5319,25 @@ version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -5957,13 +5346,43 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -5972,47 +5391,131 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
-version = "0.4.1"
+version = "0.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5"
 dependencies = [
  "memchr",
 ]
@@ -6035,40 +5538,26 @@ dependencies = [
  "aead",
  "poly1305",
  "salsa20",
- "subtle 2.4.1",
+ "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25588073e5216b50bca71d61cb8595cdb9745e87032a58c199730def2862c934"
-dependencies = [
- "proc-macro2 1.0.54",
- "quote 1.0.26",
- "syn 2.0.11",
-]
-
-[[package]]
-name = "zksync-crypto"
-version = "1.0.0"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "console_error_panic_hook",
- "franklin-crypto",
- "hex 0.4.3",
- "rand 0.4.6",
- "sha2 0.8.2",
- "wasm-bindgen",
- "wasm-bindgen-test",
- "wee_alloc",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index e6f4d5b1..80fabb7d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,26 @@
 [workspace]
-members=[
+resolver = "2"
+members = [
     "token-core/tcx-proto",
     "token-core/tcx-constants",
     "token-core/tcx-primitive",
     "token-core/tcx-crypto",
-    "token-core/tcx-chain",
+    "token-core/tcx-keystore",
     "token-core/tcx-tron",
-    "token-core/tcx-btc-fork",
-    "token-core/tcx-bch",
+    "token-core/tcx-btc-kin",
     "token-core/tcx-ckb",
+    "token-core/tcx-atom",
+    "token-core/tcx-eos",
     "token-core/tcx-substrate",
     "token-core/tcx-filecoin",
     "token-core/tcx",
     "token-core/tcx-tezos",
     "token-core/tcx-tester",
     "token-core/tcx-eth2",
-    "token-core/zksync-crypto",
+    "token-core/tcx-eth",
+    "token-core/tcx-common",
+    "token-core/tcx-migration",
+    "token-core/tcx-libs/ed25519-dalek-bip32",
     "imkey-core/ikc",
     "imkey-core/ikc-common",
     "imkey-core/ikc-device",
@@ -32,4 +37,4 @@ members=[
     "imkey-core/ikc-wallet/coin-bch",
     "imkey-core/ikc-wallet/coin-filecoin",
     "imkey-core/ikc-wallet/coin-btc-fork",
-]
\ No newline at end of file
+]
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..f04fd9d1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+build-tcx-proto:
+	cargo build -p tcx-proto
+
+check-tcx:
+	cd token-core; cargo check
+
+build-tcx:
+	cd token-core; cargo build
+
+test-tcx:
+	KDF_ROUNDS=1 cargo test --workspace --exclude 'ikc*' --exclude 'coin*'
+
+test-ikc:
+	KDF_ROUNDS=1 cargo test --workspace --exclude 'tcx*' 
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 57cf282e..24ba9a38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.5
+2.7.0
diff --git a/imkey-core/ikc-common/Cargo.toml b/imkey-core/ikc-common/Cargo.toml
index 1f9882db..a3dc774a 100644
--- a/imkey-core/ikc-common/Cargo.toml
+++ b/imkey-core/ikc-common/Cargo.toml
@@ -7,28 +7,29 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-hyper = { version = "0.14.23", features = ["full"] }
-hyper-tls = "0.5.0"
-hyper-timeout = "0.4.1"
-rustc-serialize = "0.3.24"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_derive = "1.0.110"
-serde_json = "1.0.89"
-hex = "0.4.3"
-tokio = { version = "1.22.0", features = ["full"] }
-regex = "1.7.0"
-ring = "0.16.20"
-num-bigint = "0.4.3"
-num-traits = "0.2.15"
-num-integer = "0.1.45"
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-failure = "0.1.8"
-lazy_static = "1.4.0"
-aes-ctr = "0.6.0"
-aes-soft = "0.6.4"
-block-modes = "0.7.0"
-parking_lot = "0.12.1"
-bitcoin = "0.29.2"
+hyper = { version = "=0.14.23", features = ["full"] }
+hyper-tls = "=0.5.0"
+hyper-timeout = "=0.4.1"
+rustc-serialize = "=0.3.24"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_derive = "=1.0.147"
+serde_json = "=1.0.89"
+hex = "=0.4.3"
+tokio = { version = "=1.28.2", features = ["full"] }
+regex = "=1.9.3"
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+num-integer = "=0.1.45"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
+secp256k1 = { version = "=0.24.3", features = ["rand", "recovery"] }
+anyhow = "=1.0.79"
+lazy_static = "=1.4.0"
+aes = "=0.8.3"
+cbc = "=0.1.2"
+parking_lot = "=0.12.1"
+bitcoin = "=0.29.2"
+byteorder = "=1.4.3"
+thiserror = "=1.0.56"
+base64 = "=0.13.1"
diff --git a/imkey-core/ikc-common/src/aes.rs b/imkey-core/ikc-common/src/aes.rs
index b3b0b1ae..a543fcc1 100644
--- a/imkey-core/ikc-common/src/aes.rs
+++ b/imkey-core/ikc-common/src/aes.rs
@@ -1,15 +1,60 @@
 pub mod cbc {
-    extern crate aes_soft;
-    extern crate block_modes;
+    use crate::error::CommonError;
     use crate::Result;
-    use aes_soft::Aes128;
-    use block_modes::block_padding::Pkcs7;
-    use block_modes::{BlockMode, Cbc};
-
-    type Aes128Cbc = Cbc<Aes128, Pkcs7>;
+    use aes::cipher::generic_array::GenericArray;
+    use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, BlockEncryptMut, KeyIvInit};
 
+    type Aes128CbcEnc = cbc::Encryptor<aes::Aes128>;
+    type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
+    #[inline]
     pub fn encrypt_pkcs7(data: &[u8], key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
-        let cipher = Aes128Cbc::new_var(key, iv)?;
-        Ok(cipher.encrypt_vec(data))
+        if key.len() != 16 || iv.len() != 16 {
+            return Err(CommonError::InvalidKeyIvLength.into());
+        }
+        let padding_len = 16 - (data.len() % 16);
+        let mut buf = vec![0u8; data.len() + padding_len];
+        let ct = Aes128CbcEnc::new(key.into(), iv.into())
+            .encrypt_padded_b2b_mut::<Pkcs7>(data, &mut buf)
+            .unwrap();
+
+        Ok(ct.to_vec())
+    }
+
+    #[inline]
+    pub fn decrypt_pkcs7(encrypted: &[u8], key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
+        if key.len() != 16 || iv.len() != 16 {
+            return Err(CommonError::InvalidKeyIvLength.into());
+        }
+        let mut buf = vec![0u8; encrypted.len()];
+        let key = GenericArray::from_slice(key);
+        let iv = GenericArray::from_slice(iv);
+        let pt = Aes128CbcDec::new(key, iv)
+            .decrypt_padded_b2b_mut::<Pkcs7>(encrypted, &mut buf)
+            .unwrap();
+        Ok(pt.to_vec())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::aes::cbc::{decrypt_pkcs7, encrypt_pkcs7};
+    #[test]
+    fn test_encrypt_pkcs7() {
+        let data = "TokenCoreX".as_bytes();
+        let key = hex::decode("01020304010203040102030401020304").unwrap();
+        let iv = hex::decode("01020304010203040102030401020304").unwrap();
+        let ret = encrypt_pkcs7(&data, &key, &iv).expect("encrypt_pkcs7");
+        let ret_hex = hex::encode(ret.clone());
+        assert_eq!("13d567987d7eced9c2154551bc37bc5f", ret_hex);
+        let decrypted = decrypt_pkcs7(&ret, &key, &iv).unwrap();
+        assert_eq!("TokenCoreX", String::from_utf8(decrypted).unwrap());
+
+        let key = hex::decode("0102030401020304").unwrap();
+        let ret = encrypt_pkcs7(&data, &key, &iv);
+        assert_eq!(ret.err().unwrap().to_string(), "invalid_key_iv_length");
+
+        let iv = hex::decode("0102030401020304").unwrap();
+        let ret = encrypt_pkcs7(&data, &key, &iv);
+        assert_eq!(ret.err().unwrap().to_string(), "invalid_key_iv_length");
     }
 }
diff --git a/imkey-core/ikc-common/src/apdu.rs b/imkey-core/ikc-common/src/apdu.rs
index 259f433d..2fb5aeab 100644
--- a/imkey-core/ikc-common/src/apdu.rs
+++ b/imkey-core/ikc-common/src/apdu.rs
@@ -562,7 +562,7 @@ impl ApduCheck {
             "F080" => Err(ApduError::ImkeyInMenuPage.into()),
             "F081" => Err(ApduError::ImkeyPinNotVerified.into()),
             "6F01" => Err(ApduError::ImkeyBluetoothChannelError.into()),
-            _ => Err(format_err!("imkey_command_execute_fail_{}", response_data)), //Err(ApduError::ImkeyCommandExecuteFail.into())
+            _ => Err(anyhow!("imkey_command_execute_fail_{}", response_data)), //Err(ApduError::ImkeyCommandExecuteFail.into())
         }
     }
 }
diff --git a/imkey-core/ikc-common/src/coin_info.rs b/imkey-core/ikc-common/src/coin_info.rs
index d2f8f012..56973e19 100644
--- a/imkey-core/ikc-common/src/coin_info.rs
+++ b/imkey-core/ikc-common/src/coin_info.rs
@@ -1,7 +1,6 @@
 use crate::curve::CurveType;
 use crate::Result;
-use failure::format_err;
-
+use anyhow::anyhow;
 use parking_lot::RwLock;
 
 /// Blockchain basic config
@@ -18,141 +17,197 @@ pub struct CoinInfo {
 
 lazy_static! {
     static ref COIN_INFOS: RwLock<Vec<CoinInfo>> = {
-        let mut coin_infos = Vec::new();
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/44'/0'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/44'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/49'/0'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/49'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOINCASH".to_string(),
-            derivation_path: "m/44'/145'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOINCASH".to_string(),
-            derivation_path: "m/44'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/44'/2'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/44'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/49'/2'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/49'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "TRON".to_string(),
-            derivation_path: "m/44'/195'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "NERVOS".to_string(),
-            derivation_path: "m/44'/309'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "NERVOS".to_string(),
-            derivation_path: "m/44'/309'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "POLKADOT".to_string(),
-            derivation_path: "//polkadot//imToken/0".to_string(),
-            curve: CurveType::SubSr25519,
-            network: "".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "KUSAMA".to_string(),
-            derivation_path: "//kusama//imToken/0".to_string(),
-            curve: CurveType::SubSr25519,
-            network: "".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/44'/461'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/44'/461'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/2334/461/0/0".to_string(),
-            curve: CurveType::BLS,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/2334/461/0/0".to_string(),
-            curve: CurveType::BLS,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-
+        let coin_infos = vec![
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOINCASH".to_string(),
+                derivation_path: "m/44'/145'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOINCASH".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/44'/2'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/49'/2'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "TRON".to_string(),
+                derivation_path: "m/44'/195'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "NERVOS".to_string(),
+                derivation_path: "m/44'/309'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "NERVOS".to_string(),
+                derivation_path: "m/44'/309'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "POLKADOT".to_string(),
+                derivation_path: "m/44'/354'/0'/0/0".to_string(),
+                curve: CurveType::ED25519,
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "KUSAMA".to_string(),
+                derivation_path: "m/44'/434'/0'/0/0".to_string(),
+                curve: CurveType::ED25519,
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/44'/461'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/44'/461'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/2334/461/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/2334/461/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM".to_string(),
+                derivation_path: "m/44'/60'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM".to_string(),
+                derivation_path: "m/44'/60'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM2".to_string(),
+                derivation_path: "m/12381/3600/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM2".to_string(),
+                derivation_path: "m/12381/3600/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "COSMOS".to_string(),
+                derivation_path: "m/44'/118'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "EOS".to_string(),
+                derivation_path: "m/44'/194'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "COSMOS".to_string(),
+                derivation_path: "m/44'/118'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "EOS".to_string(),
+                derivation_path: "m/44'/194'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+        ];
         RwLock::new(coin_infos)
     };
 }
@@ -176,7 +231,7 @@ pub fn coin_info_from_param(
         .collect::<Vec<CoinInfo>>();
 
     if coins.is_empty() {
-        Err(format_err!("unsupported_chain"))
+        Err(anyhow!("unsupported_chain"))
     } else {
         Ok(coins.pop().expect("coin_info_from_param"))
     }
diff --git a/imkey-core/ikc-common/src/common.rs b/imkey-core/ikc-common/src/common.rs
index 88cc9dd0..f1333867 100644
--- a/imkey-core/ikc-common/src/common.rs
+++ b/imkey-core/ikc-common/src/common.rs
@@ -1,19 +1,20 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignParam {
     #[prost(string, tag = "1")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub network: std::string::String,
+    pub network: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "4")]
-    pub input: ::std::option::Option<::prost_types::Any>,
+    pub input: ::core::option::Option<::prost_types::Any>,
     #[prost(string, tag = "5")]
-    pub payment: std::string::String,
+    pub payment: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
-    pub receiver: std::string::String,
+    pub receiver: ::prost::alloc::string::String,
     #[prost(string, tag = "7")]
-    pub sender: std::string::String,
+    pub sender: ::prost::alloc::string::String,
     #[prost(string, tag = "8")]
-    pub fee: std::string::String,
+    pub fee: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-common/src/constants.rs b/imkey-core/ikc-common/src/constants.rs
index 436f9c8c..c003c6ad 100644
--- a/imkey-core/ikc-common/src/constants.rs
+++ b/imkey-core/ikc-common/src/constants.rs
@@ -117,3 +117,8 @@ pub const ETH_TRANSACTION_TYPE_EIP2718: &str = "01";
 pub const ETH_TRANSACTION_TYPE_EIP1559: &str = "02";
 
 pub const ETH_MAX_SUPPORT_PAYMENT_LEN: usize = 255;
+
+lazy_static! {
+    /// Lazily initialized secp256k1 engine
+    pub static ref SECP256K1_ENGINE: secp256k1::Secp256k1<secp256k1::All> = secp256k1::Secp256k1::new();
+}
diff --git a/imkey-core/ikc-common/src/curve.rs b/imkey-core/ikc-common/src/curve.rs
index 3efc6160..e92ca4a0 100644
--- a/imkey-core/ikc-common/src/curve.rs
+++ b/imkey-core/ikc-common/src/curve.rs
@@ -2,25 +2,45 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub enum CurveType {
-    SECP256k1,          /* "secp256k1" */
-    ED25519,            /* "ed25519" */
-    ED25519Blake2bNano, /* "ed25519-blake2b-nano" */
-    SubSr25519,
-    Curve25519, /* "curve25519" */
+    #[serde(rename = "secp256k1")]
+    SECP256k1,
+    #[serde(rename = "ed25519")]
+    ED25519,
+    #[serde(rename = "ed25519-blake2b-nano")]
+    ED25519Blake2bNano,
+    #[serde(rename = "sr25519")]
+    SR25519,
+    #[serde(rename = "curve25519")]
+    Curve25519,
+    #[serde(rename = "nist256p1")]
     NIST256p1,
-    BLS, /* "bls" */
+    #[serde(rename = "bls12-381")]
+    BLS,
 }
 
 impl CurveType {
     pub fn as_str(&self) -> &str {
         match self {
-            CurveType::SECP256k1 => "SECP256k1",
-            CurveType::ED25519 => "ED25519 ",
-            CurveType::ED25519Blake2bNano => "ED25519Blake2bNano",
-            CurveType::SubSr25519 => "SubSr25519",
-            CurveType::Curve25519 => "Curve25519",
-            CurveType::NIST256p1 => "NIST256p1",
-            CurveType::BLS => "BLS",
+            CurveType::SECP256k1 => "secp256k1",
+            CurveType::ED25519 => "ed25519",
+            CurveType::ED25519Blake2bNano => "ed25519-blake2b-nano",
+            CurveType::SR25519 => "sr25519",
+            CurveType::Curve25519 => "curve25519",
+            CurveType::NIST256p1 => "nist256p1",
+            CurveType::BLS => "bls12-381",
+        }
+    }
+
+    pub fn from_str(value: &str) -> CurveType {
+        match value {
+            "secp256k1" => CurveType::SECP256k1,
+            "ed25519" => CurveType::ED25519,
+            "ed25519-blake2b-nano" => CurveType::ED25519Blake2bNano,
+            "sr25519" => CurveType::SR25519,
+            "curve25519" => CurveType::Curve25519,
+            "nist256p1" => CurveType::NIST256p1,
+            "bls12-381" => CurveType::BLS,
+            _ => panic!("Invalid curve type"),
         }
     }
 }
diff --git a/imkey-core/ikc-common/src/error.rs b/imkey-core/ikc-common/src/error.rs
index b686ef0e..d86f07ae 100644
--- a/imkey-core/ikc-common/src/error.rs
+++ b/imkey-core/ikc-common/src/error.rs
@@ -1,85 +1,91 @@
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+use thiserror::Error;
+
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum CommonError {
-    #[fail(display = "imkey_path_illegal")]
+    #[error("imkey_path_illegal")]
     ImkeyPathIllegal,
+    #[error("invalid_key_iv_length")]
+    InvalidKeyIvLength,
+    #[error("invalid_base58")]
+    InvalidBase58,
 }
 
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum ApduError {
-    #[fail(display = "imkey_user_not_confirmed")]
+    #[error("imkey_user_not_confirmed")]
     ImkeyUserNotConfirmed,
-    #[fail(display = "imkey_conditions_not_satisfied")]
+    #[error("imkey_conditions_not_satisfied")]
     ImkeyConditionsNotSatisfied,
-    #[fail(display = "imkey_command_format_error")]
+    #[error("imkey_command_format_error")]
     ImkeyCommandFormatError,
-    #[fail(display = "imkey_command_data_error")]
+    #[error("imkey_command_data_error")]
     ImkeyCommandDataError,
-    #[fail(display = "imkey_applet_not_exist")]
+    #[error("imkey_applet_not_exist")]
     ImkeyAppletNotExist,
-    #[fail(display = "imkey_apdu_wrong_length")]
+    #[error("imkey_apdu_wrong_length")]
     ImkeyApduWrongLength,
-    #[fail(display = "imkey_signature_verify_fail")]
+    #[error("imkey_signature_verify_fail")]
     ImkeySignatureVerifyFail,
-    #[fail(display = "imkey_bluetooth_channel_error")]
+    #[error("imkey_bluetooth_channel_error")]
     ImkeyBluetoothChannelError,
-    #[fail(display = "imkey_applet_function_not_supported")]
+    #[error("imkey_applet_function_not_supported")]
     ImkeyAppletFunctionNotSupported,
-    #[fail(display = "imkey_exceeded_max_utxo_number")]
+    #[error("imkey_exceeded_max_utxo_number")]
     ImkeyExceededMaxUtxoNumber,
-    #[fail(display = "imkey_command_execute_fail")]
+    #[error("imkey_command_execute_fail")]
     ImkeyCommandExecuteFail,
-    #[fail(display = "imkey_wallet_not_created")]
+    #[error("imkey_wallet_not_created")]
     ImkeyWalletNotCreated,
-    #[fail(display = "imkey_in_menu_page")]
+    #[error("imkey_in_menu_page")]
     ImkeyInMenuPage,
-    #[fail(display = "imkey_pin_not_verified")]
+    #[error("imkey_pin_not_verified")]
     ImkeyPinNotVerified,
 }
 
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum CoinError {
-    #[fail(display = "imkey_exceeded_max_utxo_number")]
+    #[error("imkey_exceeded_max_utxo_number")]
     ImkeyExceededMaxUtxoNumber,
-    #[fail(display = "imkey_address_mismatch_with_path")]
+    #[error("imkey_address_mismatch_with_path")]
     ImkeyAddressMismatchWithPath,
-    #[fail(display = "imkey_signature_verify_fail")]
+    #[error("imkey_signature_verify_fail")]
     ImkeySignatureVerifyFail,
-    #[fail(display = "imkey_insufficient_funds")]
+    #[error("imkey_insufficient_funds")]
     ImkeyInsufficientFunds,
-    #[fail(display = "imkey_sdk_illegal_argument")]
+    #[error("imkey_sdk_illegal_argument")]
     ImkeySdkIllegalArgument,
-    #[fail(display = "imkey_amount_less_than_minimum")]
+    #[error("imkey_amount_less_than_minimum")]
     ImkeyAmountLessThanMinimum,
-    #[fail(display = "imkey_path_illegal")]
+    #[error("imkey_path_illegal")]
     ImkeyPathIllegal,
-    #[fail(display = "get_xpub_error")]
+    #[error("get_xpub_error")]
     GetXpubError,
-    #[fail(display = "address_type_mismatch")]
+    #[error("address_type_mismatch")]
     AddressTypeMismatch,
-    #[fail(display = "invalid_address")]
+    #[error("invalid_address")]
     InvalidAddress,
-    #[fail(display = "invalid_number")]
+    #[error("invalid_number")]
     InvalidNumber,
-    #[fail(display = "invalid_param")]
+    #[error("invalid_param")]
     InvalidParam,
-    #[fail(display = "invalid_format")]
+    #[error("invalid_format")]
     InvalidFormat,
-    #[fail(display = "bch_convert_to_legacy_address_failed")]
+    #[error("bch_convert_to_legacy_address_failed")]
     ConvertToLegacyAddressFailed,
-    #[fail(display = "bch_convert_to_cash_address_failed")]
+    #[error("bch_convert_to_cash_address_failed")]
     ConvertToCashAddressFailed,
-    #[fail(display = "construct_bch_address_failed")]
+    #[error("construct_bch_address_failed")]
     ConstructBchAddressFailed,
-    #[fail(display = "the bech32 payload was empty")]
+    #[error("the bech32 payload was empty")]
     EmptyBech32Payload,
-    #[fail(display = "invalid witness script version")]
+    #[error("invalid witness script version")]
     InvalidWitnessVersion,
-    #[fail(display = "the witness program must be between 2 and 40 bytes in length")]
+    #[error("the witness program must be between 2 and 40 bytes in length")]
     InvalidWitnessProgramLength,
-    #[fail(display = "a v0 witness program must be either of length 20 or 32 bytes")]
+    #[error("a v0 witness program must be either of length 20 or 32 bytes")]
     InvalidSegwitV0ProgramLength,
-    #[fail(display = "invalid script version")]
+    #[error("invalid script version")]
     InvalidVersion,
-    #[fail(display = "invalid addr length")]
+    #[error("invalid addr length")]
     InvalidAddrLength,
 }
diff --git a/imkey-core/ikc-common/src/lib.rs b/imkey-core/ikc-common/src/lib.rs
index f6b00611..6c0d1e3a 100644
--- a/imkey-core/ikc-common/src/lib.rs
+++ b/imkey-core/ikc-common/src/lib.rs
@@ -26,14 +26,6 @@ lazy_static! {
 }
 
 #[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-common/src/path.rs b/imkey-core/ikc-common/src/path.rs
index c0d6db1a..01d932d6 100644
--- a/imkey-core/ikc-common/src/path.rs
+++ b/imkey-core/ikc-common/src/path.rs
@@ -1,22 +1,56 @@
 use crate::error::CommonError;
 use crate::Result;
-use regex::Regex;
+use std::str::FromStr;
 
 pub fn check_path_validity(path: &str) -> Result<()> {
     //check depth and length
     let strings: Vec<&str> = path.split("/").collect();
     let depth = strings.len();
-    if depth < 2 || depth > 10 || path.len() > 100 {
+    if depth < 3 || depth > 10 {
         return Err(CommonError::ImkeyPathIllegal.into());
     }
-    //regx check
-    let re = Regex::new(r"^m/[0-9'/]+$").unwrap();
-    if !re.is_match(path) {
+    Ok(())
+}
+
+pub fn check_path_max_five_depth(path: &str) -> Result<()> {
+    //check depth and length
+    let strings: Vec<&str> = path.split("/").collect();
+    let depth = strings.len();
+    if depth < 3 || depth > 6 {
         return Err(CommonError::ImkeyPathIllegal.into());
     }
     Ok(())
 }
 
+pub fn get_account_path(path: &str) -> Result<String> {
+    // example: m/44'/60'/0'/0/0
+    let _ = bitcoin::util::bip32::DerivationPath::from_str(path)?;
+    let mut children: Vec<&str> = path.split('/').collect();
+
+    ensure!(children.len() >= 4, format!("{} path is too short", path));
+
+    while children.len() > 4 {
+        children.remove(children.len() - 1);
+    }
+    Ok(children.join("/"))
+}
+
+/**
+get parent public key path
+ */
+pub fn get_parent_path(path: &str) -> Result<&str> {
+    if path.is_empty() {
+        return Err(CommonError::ImkeyPathIllegal.into());
+    }
+
+    let mut end_flg = path.rfind("/").unwrap();
+    if path.ends_with("/") {
+        let path = &path[..path.len() - 1];
+        end_flg = path.rfind("/").unwrap();
+    }
+    Ok(&path[..end_flg])
+}
+
 #[cfg(test)]
 mod test {
     use crate::path::check_path_validity;
@@ -25,5 +59,7 @@ mod test {
     fn check_path_validity_test() {
         assert!(check_path_validity("m/44'/0'/0'").is_ok());
         assert!(check_path_validity("m/44a'/0'/0'").is_err());
+        assert!(check_path_validity("m/44'/0'/0'/0'/0'").is_ok());
+        assert!(check_path_validity("m/44'/0'/0'/0'/0'/0'").is_err());
     }
 }
diff --git a/imkey-core/ikc-common/src/utility.rs b/imkey-core/ikc-common/src/utility.rs
index 7c7a248f..bf789174 100644
--- a/imkey-core/ikc-common/src/utility.rs
+++ b/imkey-core/ikc-common/src/utility.rs
@@ -1,12 +1,21 @@
+use crate::aes::cbc::encrypt_pkcs7;
+use crate::constants::SECP256K1_ENGINE;
+use crate::error::CommonError;
 use crate::Result;
+use bitcoin::hashes::{sha256, Hash};
+use bitcoin::util::base58;
+use bitcoin::util::bip32::{
+    ChainCode, ChildNumber, Error as Bip32Error, ExtendedPubKey, Fingerprint,
+};
+use bitcoin::Network;
+use byteorder::BigEndian;
+use byteorder::ByteOrder;
 use num_bigint::BigInt;
 use num_integer::Integer;
 use num_traits::{FromPrimitive, Num, Zero};
 use regex::Regex;
-use ring::digest;
-use secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
-use secp256k1::{Message, PublicKey as PublicKey2, Secp256k1, SecretKey, Signature};
-use std::str::FromStr;
+use secp256k1::ecdsa::{RecoverableSignature, RecoveryId, Signature};
+use secp256k1::{Message, PublicKey as PublicKey2, Secp256k1, SecretKey};
 
 pub fn hex_to_bytes(value: &str) -> Result<Vec<u8>> {
     let ret_data;
@@ -19,8 +28,7 @@ pub fn hex_to_bytes(value: &str) -> Result<Vec<u8>> {
 }
 
 pub fn sha256_hash(data: &[u8]) -> Vec<u8> {
-    let digest_obj = digest::digest(&digest::SHA256, data);
-    digest_obj.as_ref().to_vec()
+    sha256::Hash::hash(data).into_inner().to_vec()
 }
 
 pub fn secp256k1_sign(private_key: &[u8], message: &[u8]) -> Result<Vec<u8>> {
@@ -33,7 +41,7 @@ pub fn secp256k1_sign(private_key: &[u8], message: &[u8]) -> Result<Vec<u8>> {
     let secp = Secp256k1::new();
     //sign data
     Ok(secp
-        .sign(&message_data, &secret_key)
+        .sign_ecdsa(&message_data, &secret_key)
         .serialize_der()
         .to_vec())
 }
@@ -52,7 +60,9 @@ pub fn secp256k1_sign_verify(public: &[u8], signed: &[u8], message: &[u8]) -> Re
     let mut sig_obj = Signature::from_der(signed)?;
     sig_obj.normalize_s();
     //verify
-    Ok(secp.verify(&message_obj, &sig_obj, &public_obj).is_ok())
+    Ok(secp
+        .verify_ecdsa(&message_obj, &sig_obj, &public_obj)
+        .is_ok())
 }
 
 pub fn bigint_to_byte_vec(val: i64) -> Vec<u8> {
@@ -71,9 +81,9 @@ pub fn uncompress_pubkey_2_compress(uncomprs_pubkey: &str) -> String {
 
     let (_d, m) = y_bint.div_mod_floor(&two_bint);
     return if m.is_zero() {
-        "02".to_owned() + x
+        ("02".to_owned() + x).to_lowercase()
     } else {
-        "03".to_owned() + x
+        ("03".to_owned() + x).to_lowercase()
     };
 }
 
@@ -101,7 +111,7 @@ pub fn retrieve_recid(msg: &[u8], sign_compact: &[u8], pubkey: &Vec<u8>) -> Resu
         let sig = RecoverableSignature::from_compact(sign_compact, rec_id)?;
         let msg_to_sign = Message::from_slice(msg)?;
 
-        if let Ok(rec_pubkey) = secp_context.recover(&msg_to_sign, &sig) {
+        if let Ok(rec_pubkey) = secp_context.recover_ecdsa(&msg_to_sign, &sig) {
             let rec_pubkey_raw = rec_pubkey.serialize_uncompressed();
             if rec_pubkey_raw.to_vec() == *pubkey {
                 recid_final = i;
@@ -116,27 +126,95 @@ pub fn retrieve_recid(msg: &[u8], sign_compact: &[u8], pubkey: &Vec<u8>) -> Resu
     Ok(rec_id)
 }
 
-pub fn get_account_path(path: &str) -> Result<String> {
-    // example: m/44'/60'/0'/0/0
-    let _ = bitcoin::util::bip32::DerivationPath::from_str(path)?;
-    let mut children: Vec<&str> = path.split('/').collect();
+pub fn to_ss58check_with_version(extended_key: ExtendedPubKey, version: &[u8]) -> String {
+    let mut ret = [0; 78];
+    // let extended_key = self.0;
+    ret[0..4].copy_from_slice(version);
+    ret[4] = extended_key.depth;
+    ret[5..9].copy_from_slice(&extended_key.parent_fingerprint[..]);
+
+    BigEndian::write_u32(&mut ret[9..13], u32::from(extended_key.child_number));
+
+    ret[13..45].copy_from_slice(&extended_key.chain_code[..]);
+    ret[45..78].copy_from_slice(&extended_key.public_key.serialize()[..]);
+    base58::check_encode_slice(&ret[..])
+}
 
-    ensure!(children.len() >= 4, format!("{} path is too short", path));
+pub fn from_ss58check_with_version(s: &str) -> Result<(ExtendedPubKey, Vec<u8>)> {
+    let data = base58::from_check(s)?;
 
-    while children.len() > 4 {
-        children.remove(children.len() - 1);
+    if data.len() != 78 {
+        return Err(CommonError::InvalidBase58.into());
+    }
+    let cn_int: u32 = BigEndian::read_u32(&data[9..13]);
+    let child_number: ChildNumber = ChildNumber::from(cn_int);
+
+    let epk = ExtendedPubKey {
+        network: Network::Bitcoin,
+        depth: data[4],
+        parent_fingerprint: Fingerprint::from(&data[5..9]),
+        child_number,
+        chain_code: ChainCode::from(&data[13..45]),
+        public_key: secp256k1::PublicKey::from_slice(&data[45..78])?,
+    };
+
+    let mut network = [0; 4];
+    network.copy_from_slice(&data[0..4]);
+    Ok((epk, network.to_vec()))
+}
+
+pub fn extended_pub_key_derive(
+    extended_pub_key: &ExtendedPubKey,
+    path: &str,
+) -> Result<ExtendedPubKey> {
+    let mut parts = path.split('/').peekable();
+    if *parts.peek().unwrap() == "m" {
+        parts.next();
+    }
+
+    let children_nums = parts
+        .map(str::parse)
+        .collect::<std::result::Result<Vec<ChildNumber>, Bip32Error>>()?;
+
+    let child_key = extended_pub_key.derive_pub(&SECP256K1_ENGINE, &children_nums)?;
+
+    Ok(child_key)
+}
+
+pub fn get_xpub_prefix(network: &str) -> Vec<u8> {
+    if network == "MAINNET" {
+        hex_to_bytes("0488b21e").unwrap()
+    } else {
+        hex_to_bytes("043587cf").unwrap()
+    }
+}
+
+pub fn encrypt_xpub(xpub: &str) -> Result<String> {
+    let key = crate::XPUB_COMMON_KEY_128.read();
+    let iv = crate::XPUB_COMMON_IV.read();
+    let key_bytes = hex::decode(&*key)?;
+    let iv_bytes = hex::decode(&*iv)?;
+    let encrypted = encrypt_pkcs7(xpub.as_bytes(), &key_bytes, &iv_bytes)?;
+    anyhow::Ok(base64::encode(encrypted))
+}
+
+pub fn network_convert(network: &str) -> Network {
+    match network.to_uppercase().as_str() {
+        "MAINNET" => Network::Bitcoin,
+        "TESTNET" => Network::Testnet,
+        _ => Network::Testnet,
     }
-    Ok(children.join("/"))
 }
 
 #[cfg(test)]
 mod tests {
     use crate::utility;
-    use crate::utility::is_valid_hex;
     use crate::utility::{
         bigint_to_byte_vec, retrieve_recid, secp256k1_sign, secp256k1_sign_verify, sha256_hash,
         uncompress_pubkey_2_compress,
     };
+    use crate::utility::{is_valid_hex, network_convert};
+    use bitcoin::Network;
     use hex::FromHex;
 
     #[test]
@@ -227,4 +305,16 @@ mod tests {
         let input1 = "d8549e61c7c5fa21315f86c9b6bd7f2efd0e7aef8647c467679a8cfefff9996329c47a6509487d2ca4d0408ff8f683449d438a0491c8bf11d54fa3b2d6af9849c808ddd1b67e84e8029edc5df4dc485e41fb1de2cbdd3143f204fb4cb58ca9155a194e465dcc7fbcb9fc729147efba62fbba2ba0356a97dcf816ab1fa8f4ebedf8506fa2920ac1f92bf2d3709b3b1cbb57124db22beb866a3b42e6286a6f6b4bcab27ec9cf7403db78f43c3d957de89d5fb23b3d9bcb23c0f62d9064da159714";
         assert_eq!(is_valid_hex(input1), true,);
     }
+
+    #[test]
+    fn test_network_convert() {
+        let network = network_convert("MAINNET");
+        assert_eq!(network, Network::Bitcoin);
+        let network = network_convert("TESTNET");
+        assert_eq!(network, Network::Testnet);
+        let network = network_convert("mainnet");
+        assert_eq!(network, Network::Bitcoin);
+        let network = network_convert("ERRORNET");
+        assert_eq!(network, Network::Testnet);
+    }
 }
diff --git a/imkey-core/ikc-device/Cargo.toml b/imkey-core/ikc-device/Cargo.toml
index ab889917..3739d47a 100644
--- a/imkey-core/ikc-device/Cargo.toml
+++ b/imkey-core/ikc-device/Cargo.toml
@@ -9,24 +9,21 @@ edition = "2018"
 [dependencies]
 ikc-common = {path = "../ikc-common"}
 ikc-transport = {path = "../ikc-transport"}
-serde = { version = "1.0.147", features = ["derive"] }
-serde_derive = "1.0.110"
-serde_json = "1.0.89"
-ring = "0.16.20"
-base64 = "0.13.1"
-aes-ctr = "0.6.0"
-aes-soft = "0.6.4"
-block-modes = "0.7.0"
-hex = "0.4.3"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery", "rand-std"] }
-rand = "0.8.5"
-sha1 = "0.6.0"
-rsa = "0.7.2"
-lazy_static = "1.4.0"
-regex = "1.7.0"
-failure = "0.1.8"
-log = {version = "0.4.17", features = ["std"]}
-prost = "0.11.2"
-prost-types = "0.11.2"
-bytes = "1.3.0"
-parking_lot = "0.12.1"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_derive = "=1.0.147"
+serde_json = "=1.0.89"
+base64 = "=0.13.1"
+hex = "=0.4.3"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery", "rand-std"] }
+rand = "=0.8.5"
+sha1 = "=0.6.1"
+rsa = "=0.7.2"
+lazy_static = "=1.4.0"
+regex = "=1.9.3"
+anyhow = "=1.0.79"
+log = {version = "=0.4.17", features = ["std"]}
+prost = "=0.11.2"
+prost-types = "=0.11.2"
+bytes = "=1.4.0"
+parking_lot = "=0.12.1"
+thiserror = "=1.0.56"
diff --git a/imkey-core/ikc-device/src/app_delete.rs b/imkey-core/ikc-device/src/app_delete.rs
index f909cecb..73caa2a2 100644
--- a/imkey-core/ikc-device/src/app_delete.rs
+++ b/imkey-core/ikc-device/src/app_delete.rs
@@ -31,20 +31,18 @@ impl TsmService for AppDeleteRequest {
 
     fn send_message(&mut self) -> Result<()> {
         loop {
-            println!("send message：{:#?}", self);
             let req_data = serde_json::to_vec_pretty(&self).unwrap();
             let response_data = https::post(constants::TSM_ACTION_APP_DELETE, req_data)?;
             let return_bean: ServiceResponse<AppDeleteResponse> =
                 serde_json::from_str(response_data.as_str())?;
-            println!("return message：{:#?}", return_bean);
-            if return_bean._ReturnCode == constants::TSM_RETURN_CODE_SUCCESS {
+            if return_bean.return_code == constants::TSM_RETURN_CODE_SUCCESS {
                 //check if end
-                let next_step_key = return_bean._ReturnData.next_step_key.unwrap();
+                let next_step_key = return_bean.return_data.next_step_key.unwrap();
                 if constants::TSM_END_FLAG.eq(next_step_key.as_str()) {
                     return Ok(());
                 }
 
-                match return_bean._ReturnData.apdu_list {
+                match return_bean.return_data.apdu_list {
                     Some(apdu_list) => {
                         let handle_result =
                             ServiceResponse::<AppDeleteResponse>::apdu_handle(apdu_list)?;
diff --git a/imkey-core/ikc-device/src/app_download.rs b/imkey-core/ikc-device/src/app_download.rs
index 50996708..9d6d3406 100644
--- a/imkey-core/ikc-device/src/app_download.rs
+++ b/imkey-core/ikc-device/src/app_download.rs
@@ -33,20 +33,18 @@ impl TsmService for AppDownloadRequest {
 
     fn send_message(&mut self) -> Result<ServiceResponse<AppDownloadResponse>> {
         loop {
-            // println!("send message：{:#?}", self);
             let req_data = serde_json::to_vec_pretty(&self).unwrap();
             let response_data = https::post(constants::TSM_ACTION_APP_DOWNLOAD, req_data)?;
             let return_bean: ServiceResponse<AppDownloadResponse> =
                 serde_json::from_str(response_data.as_str())?;
-            // println!("return message：{:#?}", return_bean);
-            if return_bean._ReturnCode == constants::TSM_RETURN_CODE_SUCCESS {
+            if return_bean.return_code == constants::TSM_RETURN_CODE_SUCCESS {
                 //check step key is end
-                let next_step_key = return_bean.clone()._ReturnData.next_step_key.unwrap();
+                let next_step_key = return_bean.clone().return_data.next_step_key.unwrap();
                 if constants::TSM_END_FLAG.eq(next_step_key.as_str()) {
                     return Ok(return_bean);
                 }
 
-                match return_bean._ReturnData.apdu_list {
+                match return_bean.return_data.apdu_list {
                     Some(apdu_list) => {
                         let handle_result =
                             ServiceResponse::<AppDownloadResponse>::apdu_handle(apdu_list)?;
@@ -71,10 +69,10 @@ impl AppDownloadRequest {
         sdk_version: Option<String>,
     ) -> Self {
         AppDownloadRequest {
-            seid: seid,
-            instance_aid: instance_aid,
-            device_cert: device_cert,
-            sdk_version: sdk_version,
+            seid,
+            instance_aid,
+            device_cert,
+            sdk_version,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_APP_DOWNLOAD),
diff --git a/imkey-core/ikc-device/src/app_update.rs b/imkey-core/ikc-device/src/app_update.rs
index c4440f90..c5659765 100644
--- a/imkey-core/ikc-device/src/app_update.rs
+++ b/imkey-core/ikc-device/src/app_update.rs
@@ -33,20 +33,18 @@ impl TsmService for AppUpdateRequest {
 
     fn send_message(&mut self) -> Result<ServiceResponse<AppUpdateResponse>> {
         loop {
-            // println!("send message：{:#?}", self);
             let req_data = serde_json::to_vec_pretty(&self).unwrap();
             let response_data = https::post(constants::TSM_ACTION_APP_UPDATE, req_data)?;
             let return_bean: ServiceResponse<AppUpdateResponse> =
                 serde_json::from_str(response_data.as_str())?;
-            // println!("return message：{:#?}", return_bean);
-            if return_bean._ReturnCode == constants::TSM_RETURN_CODE_SUCCESS {
+            if return_bean.return_code == constants::TSM_RETURN_CODE_SUCCESS {
                 //check if end
-                let next_step_key = return_bean.clone()._ReturnData.next_step_key.unwrap();
+                let next_step_key = return_bean.clone().return_data.next_step_key.unwrap();
                 if constants::TSM_END_FLAG.eq(next_step_key.as_str()) {
                     return Ok(return_bean);
                 }
 
-                match return_bean._ReturnData.apdu_list {
+                match return_bean.return_data.apdu_list {
                     Some(apdu_list) => {
                         let handle_result =
                             ServiceResponse::<AppUpdateResponse>::apdu_handle(apdu_list)?;
@@ -71,10 +69,10 @@ impl AppUpdateRequest {
         sdk_version: Option<String>,
     ) -> Self {
         AppUpdateRequest {
-            seid: seid,
-            instance_aid: instance_aid,
-            device_cert: device_cert,
-            sdk_version: sdk_version,
+            seid,
+            instance_aid,
+            device_cert,
+            sdk_version,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_APP_UPDATE),
diff --git a/imkey-core/ikc-device/src/auth_code_storage.rs b/imkey-core/ikc-device/src/auth_code_storage.rs
index c0408bbd..65658a80 100644
--- a/imkey-core/ikc-device/src/auth_code_storage.rs
+++ b/imkey-core/ikc-device/src/auth_code_storage.rs
@@ -28,12 +28,10 @@ impl TsmService for AuthCodeStorageRequest {
     type ReturnData = ();
 
     fn send_message(&mut self) -> Result<()> {
-        println!("send message：{:#?}", self);
         let req_data = serde_json::to_vec_pretty(&self).unwrap();
         let response_data = https::post(constants::TSM_ACTION_AUTHCODE_STORAGE, req_data)?;
         let return_bean: ServiceResponse<AuthCodeStorageResponse> =
             serde_json::from_str(response_data.as_str())?;
-        println!("return message：{:#?}", return_bean);
         return_bean.service_res_check()
     }
 }
@@ -41,8 +39,8 @@ impl TsmService for AuthCodeStorageRequest {
 impl AuthCodeStorageRequest {
     pub fn build_request_data(seid: String, auth_code: String) -> Self {
         AuthCodeStorageRequest {
-            seid: seid,
-            auth_code: auth_code,
+            seid,
+            auth_code,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_AUTHCODE_STORAGE),
diff --git a/imkey-core/ikc-device/src/cos_check_update.rs b/imkey-core/ikc-device/src/cos_check_update.rs
index 8e3ef5e8..c030a093 100644
--- a/imkey-core/ikc-device/src/cos_check_update.rs
+++ b/imkey-core/ikc-device/src/cos_check_update.rs
@@ -27,12 +27,10 @@ impl TsmService for CosCheckUpdateRequest {
     type ReturnData = ServiceResponse<CosCheckUpdateResponse>;
 
     fn send_message(&mut self) -> Result<ServiceResponse<CosCheckUpdateResponse>> {
-        // println!("send message：{:#?}", self);
         let req_data = serde_json::to_vec_pretty(&self).unwrap();
         let response_data = https::post(constants::TSM_ACTION_COS_CHECK_UPDATE, req_data)?;
         let return_bean: ServiceResponse<CosCheckUpdateResponse> =
             serde_json::from_str(response_data.as_str())?;
-        // println!("return message：{:#?}", return_bean);
         match return_bean.service_res_check() {
             Ok(()) => Ok(return_bean),
             Err(e) => Err(e),
@@ -43,8 +41,8 @@ impl TsmService for CosCheckUpdateRequest {
 impl CosCheckUpdateRequest {
     pub fn build_request_data(seid: String, cos_version: String) -> Self {
         CosCheckUpdateRequest {
-            seid: seid,
-            cos_version: cos_version,
+            seid,
+            cos_version,
             command_id: String::from(constants::TSM_ACTION_COS_CHECK_UPDATE),
         }
     }
diff --git a/imkey-core/ikc-device/src/cos_upgrade.rs b/imkey-core/ikc-device/src/cos_upgrade.rs
index 91cb6890..9d63a121 100644
--- a/imkey-core/ikc-device/src/cos_upgrade.rs
+++ b/imkey-core/ikc-device/src/cos_upgrade.rs
@@ -76,10 +76,10 @@ impl CosUpgradeRequest {
 
         let mut request_data = CosUpgradeRequest {
             seid: seid.clone(),
-            sn: sn,
+            sn,
             device_cert: device_cert.clone(),
-            se_cos_version: se_cos_version,
-            is_bl_status: is_bl_status,
+            se_cos_version,
+            is_bl_status,
             step_key: if is_jump {
                 "03".to_string()
             } else {
@@ -88,25 +88,23 @@ impl CosUpgradeRequest {
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_COS_UPGRADE),
             card_ret_data_list: None,
-            se_bl_version: se_bl_version,
+            se_bl_version,
         };
 
         loop {
-            // println!("send message：{:#?}", request_data);
             let req_data = serde_json::to_vec_pretty(&request_data).unwrap();
             let response_data = https::post(constants::TSM_ACTION_COS_UPGRADE, req_data)?;
             let return_bean: ServiceResponse<CosUpgradeResponse> =
                 serde_json::from_str(response_data.as_str())?;
-            // println!("return message：{:#?}", return_bean);
-            if return_bean._ReturnCode == constants::TSM_RETURN_CODE_SUCCESS {
+            if return_bean.return_code == constants::TSM_RETURN_CODE_SUCCESS {
                 //check if end
-                let next_step_key = return_bean._ReturnData.next_step_key.unwrap();
+                let next_step_key = return_bean.return_data.next_step_key.unwrap();
                 if constants::TSM_END_FLAG.eq(next_step_key.as_str()) {
                     return Ok(());
                 }
 
                 let mut apdu_res: Vec<String> = vec![];
-                match return_bean._ReturnData.apdu_list {
+                match return_bean.return_data.apdu_list {
                     Some(apdu_list) => {
                         for (index_val, apdu_val) in apdu_list.iter().enumerate() {
                             //send apdu command and get return data
@@ -138,7 +136,7 @@ impl CosUpgradeRequest {
 
                 if "06".eq(next_step_key.as_str()) {
                     //applet download
-                    match &return_bean._ReturnData.instance_aid_list {
+                    match &return_bean.return_data.instance_aid_list {
                         Some(aid_list) => {
                             for temp_instance_aid in aid_list.iter() {
                                 AppDownloadRequest::build_request_data(
diff --git a/imkey-core/ikc-device/src/device_binding.rs b/imkey-core/ikc-device/src/device_binding.rs
index bd77e879..c06e49f1 100644
--- a/imkey-core/ikc-device/src/device_binding.rs
+++ b/imkey-core/ikc-device/src/device_binding.rs
@@ -1,26 +1,22 @@
-extern crate aes_soft as aes;
-
 use super::key_manager::KeyManager;
 use crate::auth_code_storage::AuthCodeStorageRequest;
 use crate::device_cert_check::DeviceCertCheckRequest;
 use crate::error::{BindError, ImkeyError};
 use crate::Result;
 use crate::{device_manager, TsmService};
-use aes::Aes128;
-use block_modes::block_padding::Pkcs7;
-use block_modes::{BlockMode, Cbc};
+use ikc_common::aes::cbc::encrypt_pkcs7;
 use ikc_common::apdu::{Apdu, ApduCheck, ImkApdu};
 use ikc_common::constants::{
     BIND_RESULT_ERROR, BIND_RESULT_SUCCESS, BIND_STATUS_BOUND_OTHER, BIND_STATUS_BOUND_THIS,
     BIND_STATUS_UNBOUND, IMK_AID,
 };
+use ikc_common::utility::sha256_hash;
 #[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
 use ikc_transport::hid_api::hid_connect;
 use ikc_transport::message::send_apdu;
 use parking_lot::Mutex;
 use rand::rngs::OsRng;
 use regex::Regex;
-use ring::digest;
 use rsa::{BigUint, PaddingScheme, PublicKey as RSAPublic, RsaPublicKey};
 use secp256k1::{ecdh, PublicKey, SecretKey};
 use sha1::Sha1;
@@ -125,16 +121,14 @@ impl DeviceManage {
         data.extend(binding_code_bytes);
         data.extend(&key_manager_obj.pub_key);
         data.extend(&key_manager_obj.se_pub_key);
-        let data_hash = digest::digest(&digest::SHA256, data.as_slice());
+        let data_hash = sha256_hash(data.as_slice());
 
         //encryption hash value by session key
-        type Aes128Cbc = Cbc<Aes128, Pkcs7>;
-        let cipher = Aes128Cbc::new_var(
+        let ciphertext = encrypt_pkcs7(
+            &data_hash.as_ref(),
             &key_manager_obj.session_key,
-            &gen_iv(&temp_binding_code).as_ref(),
+            &gen_iv(&temp_binding_code),
         )?;
-
-        let ciphertext = cipher.encrypt_vec(data_hash.as_ref());
         //gen identityVerify command
         let mut apdu_data = vec![];
         apdu_data.extend(&key_manager_obj.pub_key);
@@ -168,11 +162,11 @@ fn select_imk_applet() -> Result<()> {
 generator iv
 */
 fn gen_iv(auth_code: &String) -> [u8; 16] {
-    let salt_bytes = digest::digest(&digest::SHA256, "bindingCode".as_bytes());
-    let auth_code_hash = digest::digest(&digest::SHA256, auth_code.as_bytes());
+    let salt_bytes = sha256_hash("bindingCode".as_bytes());
+    let auth_code_hash = sha256_hash(auth_code.as_bytes());
     let mut result = [0u8; 32];
-    for (index, value) in auth_code_hash.as_ref().iter().enumerate() {
-        result[index] = value ^ salt_bytes.as_ref().get(index).unwrap();
+    for (index, value) in auth_code_hash.iter().enumerate() {
+        result[index] = value ^ salt_bytes.get(index).unwrap();
     }
     let mut return_data = [0u8; 16];
     return_data.copy_from_slice(&result[..16]);
@@ -243,7 +237,7 @@ pub fn bind_test() {
 // pub const TEST_KEY_PATH: &str = "/tmp/";
 // pub const TEST_BIND_CODE: &str = "MCYNK5AH";
 pub const TEST_KEY_PATH: &str = "/tmp/";
-pub const TEST_BIND_CODE: &str = "DJKP4NUR";
+pub const TEST_BIND_CODE: &str = "7FVRAJJ7";
 
 #[cfg(test)]
 mod test {
diff --git a/imkey-core/ikc-device/src/device_cert_check.rs b/imkey-core/ikc-device/src/device_cert_check.rs
index 4cad4c28..cc8f0e30 100644
--- a/imkey-core/ikc-device/src/device_cert_check.rs
+++ b/imkey-core/ikc-device/src/device_cert_check.rs
@@ -31,16 +31,14 @@ impl TsmService for DeviceCertCheckRequest {
     type ReturnData = ();
 
     fn send_message(&mut self) -> Result<()> {
-        println!("send message：{:#?}", self);
         let req_data = serde_json::to_vec_pretty(&self).unwrap();
         let response_data = https::post(constants::TSM_ACTION_DEVICE_CERT_CHECK, req_data)?;
         let return_bean: ServiceResponse<DeviceCertCheckResponse> =
             serde_json::from_str(response_data.as_str())?;
-        println!("return message：{:#?}", return_bean);
 
         match return_bean.service_res_check() {
             Ok(()) => {
-                if return_bean._ReturnData.verify_result.unwrap() {
+                if return_bean.return_data.verify_result.unwrap() {
                     return Ok(());
                 }
                 Err(ImkeyError::ImkeySeCertInvalid.into())
@@ -53,9 +51,9 @@ impl TsmService for DeviceCertCheckRequest {
 impl DeviceCertCheckRequest {
     pub fn build_request_data(seid: String, sn: String, device_cert: String) -> Self {
         DeviceCertCheckRequest {
-            seid: seid,
-            sn: sn,
-            device_cert: device_cert,
+            seid,
+            sn,
+            device_cert,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_DEVICE_CERT_CHECK),
@@ -68,9 +66,9 @@ impl DeviceCertCheckRequest {
 mod test {
     use crate::device_binding::KEY_MANAGER;
     use crate::device_cert_check::DeviceCertCheckRequest;
-    use crate::device_manager::{get_cert, get_se_id, get_sn};
+    use crate::device_manager::{get_se_id, get_sn};
     use crate::TsmService;
-    use ikc_common::apdu::{Apdu, ApduCheck, ImkApdu};
+    use ikc_common::apdu::{Apdu, ImkApdu};
     use ikc_common::constants::IMK_AID;
     use ikc_transport::hid_api::hid_connect;
     use ikc_transport::message::send_apdu;
@@ -85,7 +83,7 @@ mod test {
         ////test environment cert
         // let device_cert = "7F2181C5931018080000000000860001010000000106420200015F200401020304950200805F2504201810145F2404FFFFFFFF53007F4947B0410403089D8A83A87F24D906303A49D39669D17B0F7AB76EB098A65AFEF31154E75DEE5B87B69CBF78F11E831A4961C8A8F031C2869EA0716C798F76F5E91338DC35F002DFFE5F37473045022100EB46DC605568CF8D5051CD67CEC234C66FC6E2561D2FE57D8DDF8D4D204695A6022009C246BE380DD2A8972807D2AE2A0FE22877408717E239AAA0C2530524714A48".to_string();
 
-        let mut key_manager_obj = KEY_MANAGER.lock();
+        let key_manager_obj = KEY_MANAGER.lock();
         //gen bindchec apdu
         let bind_check_apdu = ImkApdu::bind_check(&key_manager_obj.pub_key);
         //send bindcheck command and get return data
diff --git a/imkey-core/ikc-device/src/device_manager.rs b/imkey-core/ikc-device/src/device_manager.rs
index 0960210c..344bd913 100644
--- a/imkey-core/ikc-device/src/device_manager.rs
+++ b/imkey-core/ikc-device/src/device_manager.rs
@@ -11,6 +11,7 @@ use crate::device_binding::DeviceManage;
 use crate::se_query::SeQueryResponse;
 use crate::ServiceResponse;
 use crate::{Result, TsmService};
+use anyhow::anyhow;
 use app_update::AppUpdateRequest;
 use ikc_common::apdu::{Apdu, ApduCheck};
 use ikc_common::applet;
@@ -116,7 +117,7 @@ pub fn get_ble_name() -> Result<String> {
 pub fn set_ble_name(ble_name: String) -> Result<String> {
     let name_verify_regex = Regex::new(r"[0-9A-Za-z]{1,12}").unwrap();
     if !name_verify_regex.is_match(ble_name.as_ref()) {
-        return Err(format_err!("imkey_device_name_invalid"));
+        return Err(anyhow!("imkey_device_name_invalid"));
     }
     let apdu = Apdu::set_ble_name(ble_name.as_ref());
     let res = send_apdu(apdu)?;
@@ -264,7 +265,7 @@ mod test {
     fn app_download_wrong_appname_test() {
         assert!(hid_connect(constants::DEVICE_MODEL_NAME).is_ok());
         //Enter the wrong app name
-        let result = app_download("TEST");
+        let _result = app_download("TEST");
     }
 
     #[test]
@@ -278,7 +279,7 @@ mod test {
     #[should_panic(expected = "imkey_app_name_not_exist")]
     fn app_update_wrong_app_name_test() {
         assert!(hid_connect(constants::DEVICE_MODEL_NAME).is_ok());
-        let result = app_update("TEST");
+        let _result = app_update("TEST");
     }
 
     #[test]
diff --git a/imkey-core/ikc-device/src/deviceapi.rs b/imkey-core/ikc-device/src/deviceapi.rs
index 3b3c1dae..af0bed47 100644
--- a/imkey-core/ikc-device/src/deviceapi.rs
+++ b/imkey-core/ikc-device/src/deviceapi.rs
@@ -1,142 +1,165 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppDownloadReq {
     #[prost(string, tag = "1")]
-    pub app_name: std::string::String,
+    pub app_name: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppDownloadRes {
     #[prost(string, repeated, tag = "1")]
-    pub address_register_list: ::std::vec::Vec<std::string::String>,
+    pub address_register_list: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppUpdateReq {
     #[prost(string, tag = "1")]
-    pub app_name: std::string::String,
+    pub app_name: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppUpdateRes {
     #[prost(string, repeated, tag = "1")]
-    pub address_register_list: ::std::vec::Vec<std::string::String>,
+    pub address_register_list: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppDeleteReq {
     #[prost(string, tag = "1")]
-    pub app_name: std::string::String,
+    pub app_name: ::prost::alloc::string::String,
 }
 /// check_update api
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CheckUpdateRes {
     #[prost(string, tag = "1")]
-    pub se_id: std::string::String,
+    pub se_id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub sn: std::string::String,
+    pub sn: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub status: std::string::String,
+    pub status: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub sdk_mode: std::string::String,
+    pub sdk_mode: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "5")]
-    pub available_app_list: ::std::vec::Vec<AvailableAppBean>,
+    pub available_app_list: ::prost::alloc::vec::Vec<AvailableAppBean>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AvailableAppBean {
     #[prost(string, tag = "1")]
-    pub app_name: std::string::String,
+    pub app_name: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub app_logo: std::string::String,
+    pub app_logo: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub installed_version: std::string::String,
+    pub installed_version: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub last_updated: std::string::String,
+    pub last_updated: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub latest_version: std::string::String,
+    pub latest_version: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
-    pub install_mode: std::string::String,
+    pub install_mode: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BindCheckRes {
     #[prost(string, tag = "1")]
-    pub bind_status: std::string::String,
+    pub bind_status: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BindAcquireReq {
     #[prost(string, tag = "1")]
-    pub bind_code: std::string::String,
+    pub bind_code: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BindAcquireRes {
     #[prost(string, tag = "1")]
-    pub bind_result: std::string::String,
+    pub bind_result: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetSeidRes {
     #[prost(string, tag = "1")]
-    pub seid: std::string::String,
+    pub seid: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetSnRes {
     #[prost(string, tag = "1")]
-    pub sn: std::string::String,
+    pub sn: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetRamSizeRes {
     #[prost(string, tag = "1")]
-    pub ram_size: std::string::String,
+    pub ram_size: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetFirmwareVersionRes {
     #[prost(string, tag = "1")]
-    pub firmware_version: std::string::String,
+    pub firmware_version: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetBatteryPowerRes {
     #[prost(string, tag = "1")]
-    pub battery_power: std::string::String,
+    pub battery_power: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetLifeTimeRes {
     #[prost(string, tag = "1")]
-    pub life_time: std::string::String,
+    pub life_time: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetBleNameRes {
     #[prost(string, tag = "1")]
-    pub ble_name: std::string::String,
+    pub ble_name: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SetBleNameReq {
     #[prost(string, tag = "1")]
-    pub ble_name: std::string::String,
+    pub ble_name: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetBleVersionRes {
     #[prost(string, tag = "1")]
-    pub ble_version: std::string::String,
+    pub ble_version: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetSdkInfoRes {
     #[prost(string, tag = "1")]
-    pub sdk_version: std::string::String,
+    pub sdk_version: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DeviceConnectReq {
     #[prost(string, tag = "1")]
-    pub device_model_name: std::string::String,
+    pub device_model_name: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CosCheckUpdateRes {
     #[prost(string, tag = "1")]
-    pub seid: std::string::String,
+    pub seid: ::prost::alloc::string::String,
     #[prost(bool, tag = "2")]
     pub is_latest: bool,
     #[prost(string, tag = "3")]
-    pub latest_cos_version: std::string::String,
+    pub latest_cos_version: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub update_type: std::string::String,
+    pub update_type: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub description: std::string::String,
+    pub description: ::prost::alloc::string::String,
     #[prost(bool, tag = "6")]
     pub is_update_success: bool,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct IsBlStatusRes {
     #[prost(bool, tag = "1")]
diff --git a/imkey-core/ikc-device/src/error.rs b/imkey-core/ikc-device/src/error.rs
index 19443162..b5ac4e93 100644
--- a/imkey-core/ikc-device/src/error.rs
+++ b/imkey-core/ikc-device/src/error.rs
@@ -1,63 +1,65 @@
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+use thiserror::Error;
+
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum ImkeyError {
-    #[fail(display = "imkey_tsm_device_authenticity_check_fail")]
+    #[error("imkey_tsm_device_authenticity_check_fail")]
     ImkeyTsmDeviceAuthenticityCheckFail,
-    #[fail(display = "imkey_tsm_device_not_activated")]
+    #[error("imkey_tsm_device_not_activated")]
     ImkeyTsmDeviceNotActivated,
-    #[fail(display = "imkey_tsm_device_illegal")]
+    #[error("imkey_tsm_device_illegal")]
     ImkeyTsmDeviceIllegal,
-    #[fail(display = "imkey_tsm_device_stop_using")]
+    #[error("imkey_tsm_device_stop_using")]
     ImkeyTsmDeviceStopUsing,
-    #[fail(display = "imkey_tsm_server_error")]
+    #[error("imkey_tsm_server_error")]
     ImkeyTsmServerError,
-    #[fail(display = "imkey_se_cert_invalid")]
+    #[error("imkey_se_cert_invalid")]
     ImkeySeCertInvalid,
-    #[fail(display = "imkey_tsm_device_update_check_fail")]
+    #[error("imkey_tsm_device_update_check_fail")]
     ImkeyTsmDeviceUpdateCheckFail,
-    #[fail(display = "imkey_tsm_device_active_fail")]
+    #[error("imkey_tsm_device_active_fail")]
     ImkeyTsmDeviceActiveFail,
-    #[fail(display = "imkey_tsm_receipt_check_fail")]
+    #[error("imkey_tsm_receipt_check_fail")]
     ImkeyTsmReceiptCheckFail,
-    #[fail(display = "imkey_tsm_app_download_fail")]
+    #[error("imkey_tsm_app_download_fail")]
     ImkeyTsmAppDownloadFail,
-    #[fail(display = "imkey_tsm_app_update_fail")]
+    #[error("imkey_tsm_app_update_fail")]
     ImkeyTsmAppUpdateFail,
-    #[fail(display = "imkey_tsm_app_delete_fail")]
+    #[error("imkey_tsm_app_delete_fail")]
     ImkeyTsmAppDeleteFail,
-    #[fail(display = "imkey_tsm_oce_cert_check_fail")]
+    #[error("imkey_tsm_oce_cert_check_fail")]
     ImkeyTsmOceCertCheckFail,
-    #[fail(display = "imkey_tsm_cos_info_no_conf")]
+    #[error("imkey_tsm_cos_info_no_conf")]
     ImkeyTsmCosInfoNoConf,
-    #[fail(display = "imkey_tsm_cos_upgrade_fail")]
+    #[error("imkey_tsm_cos_upgrade_fail")]
     ImkeyTsmCosUpgradeFail,
-    #[fail(display = "imkey_tsm_upload_cos_version_is_null")]
+    #[error("imkey_tsm_upload_cos_version_is_null")]
     ImkeyTsmUploadCosVersionIsNull,
-    #[fail(display = "imkey_tsm_switch_bl_status_fail")]
+    #[error("imkey_tsm_switch_bl_status_fail")]
     ImkeyTsmSwitchBlStatusFail,
-    #[fail(display = "imkey_tsm_write_wallet_address_fail")]
+    #[error("imkey_tsm_write_wallet_address_fail")]
     ImkeyTsmWriteWalletAddressFail,
-    #[fail(display = "imkey_device_reconnect_fail")]
+    #[error("imkey_device_reconnect_fail")]
     ImkeyDeviceReconnectFail,
-    #[fail(display = "imkey_tsm_check_update_fail")]
+    #[error("imkey_tsm_check_update_fail")]
     ImkeyTsmCosCheckUpdateFail,
-    #[fail(display = "imkey_auth_code_ciphertext_storage_fail")]
+    #[error("imkey_auth_code_ciphertext_storage_fail")]
     ImkeyTsmAuthCodeCiphertextStorageFail,
-    #[fail(display = "imkey_tsm_cos_version_unsupport_applet")]
-    ImkeyTsmCosVersionUnsupport_applet,
-    #[fail(display = "imkey_tsm_device_unsupport_applet")]
-    ImkeyTsmDeviceUnsupport_applet,
+    #[error("imkey_tsm_cos_version_unsupport_applet")]
+    ImkeyTsmCosVersionUnsupportApplet,
+    #[error("imkey_tsm_device_unsupport_applet")]
+    ImkeyTsmDeviceUnsupportApplet,
 }
 
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum BindError {
-    #[fail(display = "imkey_keyfile_io_error")]
+    #[error("imkey_keyfile_io_error")]
     ImkeyKeyfileIoError,
-    #[fail(display = "imkey_sdk_illegal_argument")]
+    #[error("imkey_sdk_illegal_argument")]
     ImkeySdkIllegalArgument,
-    #[fail(display = "imkey_encrypt_authcode_fail")]
+    #[error("imkey_encrypt_authcode_fail")]
     ImkeyEncryptAuthcodeFail,
-    #[fail(display = "imkey_save_key_file_fail")]
+    #[error("imkey_save_key_file_fail")]
     ImkeySaveKeyFileFail,
-    #[fail(display = "imkey_authcode_error")]
+    #[error("imkey_authcode_error")]
     ImkeyAuthcodeError,
 }
diff --git a/imkey-core/ikc-device/src/key_manager.rs b/imkey-core/ikc-device/src/key_manager.rs
index ab411e39..fd9bcb15 100644
--- a/imkey-core/ikc-device/src/key_manager.rs
+++ b/imkey-core/ikc-device/src/key_manager.rs
@@ -1,24 +1,15 @@
+use crate::error::BindError;
+use crate::Result;
 use base64::{decode, encode};
-use ring::digest;
+use ikc_common::aes::cbc::{decrypt_pkcs7, encrypt_pkcs7};
+use ikc_common::utility::{is_valid_hex, sha256_hash};
 use secp256k1::rand::rngs::OsRng;
+use secp256k1::Secp256k1;
 use std::fs;
 use std::fs::{File, OpenOptions};
 use std::io::{ErrorKind, Read, Write};
 use std::path::Path;
 
-extern crate aes_soft as aes;
-extern crate block_modes;
-
-use crate::error::BindError;
-use crate::Result;
-use aes_soft::Aes128;
-use block_modes::block_padding::Pkcs7;
-use block_modes::{BlockMode, Cbc};
-use hex::FromHex;
-use ikc_common::utility::is_valid_hex;
-use rand::thread_rng;
-use secp256k1::Secp256k1;
-
 pub struct KeyManager {
     pub pri_key: Vec<u8>,
     //32 byte
@@ -52,12 +43,8 @@ impl KeyManager {
     */
     pub fn gen_encrypt_key(&mut self, seid: &str, sn: &str) {
         //calc seid and sn hash
-        let seid_hash = digest::digest(&digest::SHA256, seid.as_bytes())
-            .as_ref()
-            .to_vec();
-        let sn_hash = digest::digest(&digest::SHA256, sn.as_bytes())
-            .as_ref()
-            .to_vec();
+        let seid_hash = sha256_hash(seid.as_bytes());
+        let sn_hash = sha256_hash(sn.as_bytes());
 
         let mut xor_result: Vec<u8> = vec![];
         for (index, value) in seid_hash.iter().enumerate() {
@@ -79,14 +66,11 @@ impl KeyManager {
         data.extend(self.session_key.iter());
 
         //calc HASH
-        let hash = digest::digest(&digest::SHA256, data.as_slice());
-        data.extend(hash.as_ref()[..4].iter());
+        let hash = sha256_hash(data.as_slice());
+        data.extend(&hash[..4]);
 
         //AES-CBC encryption
-        type Aes128Cbc = Cbc<Aes128, Pkcs7>;
-        let cipher = Aes128Cbc::new_var(self.encry_key.as_ref(), self.iv.as_ref())
-            .expect("aes_128cbc_encrypt_error");
-        let ciphertext = cipher.encrypt_vec(data.as_ref());
+        let ciphertext = encrypt_pkcs7(&data, &self.encry_key, &self.iv)?;
 
         //base64 coding
         Ok(encode(&ciphertext))
@@ -129,13 +113,11 @@ impl KeyManager {
         };
 
         //AES-CBC Decrypt
-        type Aes128Cbc = Cbc<Aes128, Pkcs7>;
-        let cipher = Aes128Cbc::new_var(self.encry_key.as_ref(), self.iv.as_ref())?;
-        let decrypt_result = cipher.decrypt_vec(&ciphertext_bytes);
-        if decrypt_result.is_err() {
+        let plaintext = decrypt_pkcs7(&ciphertext_bytes, &self.encry_key, &self.iv);
+        if plaintext.is_err() {
             return Ok(false);
         }
-        let decrypted_data = decrypt_result.unwrap();
+        let decrypted_data = plaintext?;
 
         //Parsing data
         //pri_key
@@ -155,10 +137,9 @@ impl KeyManager {
 
         //check checksum
         let data = &decrypted_data[..178];
-        let data_hash = digest::digest(&digest::SHA256, data);
-        let data_hash_byte = data_hash.as_ref();
+        let data_hash = sha256_hash(data);
         for (index, val) in self.check_sum.iter().enumerate() {
-            if val != &data_hash_byte[index] {
+            if val != &data_hash[index] {
                 return Ok(false);
             }
         }
diff --git a/imkey-core/ikc-device/src/lib.rs b/imkey-core/ikc-device/src/lib.rs
index e2ddbbd7..bc5ad027 100644
--- a/imkey-core/ikc-device/src/lib.rs
+++ b/imkey-core/ikc-device/src/lib.rs
@@ -16,10 +16,9 @@ pub mod key_manager;
 extern crate lazy_static;
 extern crate ikc_transport;
 pub mod error;
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
+pub type Result<T> = result::Result<T, anyhow::Error>;
 use crate::error::ImkeyError;
 use ikc_common::constants;
 use ikc_transport::message;
@@ -30,9 +29,12 @@ pub mod cos_check_update;
 #[allow(non_snake_case)]
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ServiceResponse<T> {
-    pub _ReturnCode: String,
-    pub _ReturnMsg: String,
-    pub _ReturnData: T,
+    #[serde(rename = "_ReturnCode")]
+    pub return_code: String,
+    #[serde(rename = "_ReturnMsg")]
+    pub return_msg: String,
+    #[serde(rename = "_ReturnData")]
+    pub return_data: T,
 }
 
 pub trait TsmService {
@@ -42,7 +44,7 @@ pub trait TsmService {
 
 impl<T> ServiceResponse<T> {
     pub fn service_res_check(&self) -> Result<()> {
-        match self._ReturnCode.as_str() {
+        match self.return_code.as_str() {
             constants::TSM_RETURN_CODE_SUCCESS => Ok(()),
             constants::TSM_RETURNCODE_APP_DELETE_FAIL => {
                 Err(ImkeyError::ImkeyTsmAppDeleteFail.into())
@@ -97,10 +99,10 @@ impl<T> ServiceResponse<T> {
                 Err(ImkeyError::ImkeyTsmDeviceUpdateCheckFail.into())
             }
             constants::TSM_RETURNCODE_COS_VERSION_UNSUPPORT_APPLET => {
-                Err(ImkeyError::ImkeyTsmCosVersionUnsupport_applet.into())
+                Err(ImkeyError::ImkeyTsmCosVersionUnsupportApplet.into())
             }
             constants::TSM_RETURNCODE_DEVICE_UNSUPPORT_APPLET => {
-                Err(ImkeyError::ImkeyTsmDeviceUnsupport_applet.into())
+                Err(ImkeyError::ImkeyTsmDeviceUnsupportApplet.into())
             }
             _ => Err(ImkeyError::ImkeyTsmServerError.into()),
         }
diff --git a/imkey-core/ikc-device/src/se_activate.rs b/imkey-core/ikc-device/src/se_activate.rs
index 51e19af2..3d7b1936 100644
--- a/imkey-core/ikc-device/src/se_activate.rs
+++ b/imkey-core/ikc-device/src/se_activate.rs
@@ -30,20 +30,18 @@ impl TsmService for SeActivateRequest {
 
     fn send_message(&mut self) -> Result<()> {
         loop {
-            println!("send message：{:#?}", self);
             let req_data = serde_json::to_vec_pretty(&self).unwrap();
             let response_data = https::post(constants::TSM_ACTION_SE_ACTIVATE, req_data)?;
             let return_bean: ServiceResponse<SeActivateResponse> =
                 serde_json::from_str(response_data.as_str())?;
-            println!("return message：{:#?}", return_bean);
-            if return_bean._ReturnCode == constants::TSM_RETURN_CODE_SUCCESS {
+            if return_bean.return_code == constants::TSM_RETURN_CODE_SUCCESS {
                 //check if end
-                let next_step_key = return_bean._ReturnData.next_step_key.unwrap();
+                let next_step_key = return_bean.return_data.next_step_key.unwrap();
                 if constants::TSM_END_FLAG.eq(next_step_key.as_str()) {
                     return Ok(());
                 }
 
-                match return_bean._ReturnData.apdu_list {
+                match return_bean.return_data.apdu_list {
                     Some(apdu_list) => {
                         let handle_result =
                             ServiceResponse::<SeActivateResponse>::apdu_handle(apdu_list)?;
@@ -63,9 +61,9 @@ impl TsmService for SeActivateRequest {
 impl SeActivateRequest {
     pub fn build_request_data(seid: String, sn: String, device_cert: String) -> Self {
         SeActivateRequest {
-            seid: seid,
-            sn: sn,
-            device_cert: device_cert,
+            seid,
+            sn,
+            device_cert,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_SE_ACTIVATE),
diff --git a/imkey-core/ikc-device/src/se_query.rs b/imkey-core/ikc-device/src/se_query.rs
index 93bf68cd..f30c0611 100644
--- a/imkey-core/ikc-device/src/se_query.rs
+++ b/imkey-core/ikc-device/src/se_query.rs
@@ -43,21 +43,19 @@ impl TsmService for SeQueryRequest {
     type ReturnData = ServiceResponse<SeQueryResponse>;
 
     fn send_message(&mut self) -> Result<ServiceResponse<SeQueryResponse>> {
-        // println!("send message：{:#?}", self);
         let req_data = serde_json::to_vec_pretty(&self).unwrap();
         let response_data = https::post(constants::TSM_ACTION_SE_QUERY, req_data)?;
         let mut return_bean: ServiceResponse<SeQueryResponse> =
             serde_json::from_str(response_data.as_str())?;
-        // println!("return message：{:#?}", return_bean);
 
         match return_bean.service_res_check() {
             Ok(()) => {
-                return_bean._ReturnData.status =
+                return_bean.return_data.status =
                     Some(constants::IMKEY_DEV_STATUS_LATEST.to_string());
                 Ok(return_bean)
             }
             Err(e) => {
-                if constants::TSM_RETURNCODE_DEV_INACTIVATED.eq(return_bean._ReturnCode.as_str()) {
+                if constants::TSM_RETURNCODE_DEV_INACTIVATED.eq(return_bean.return_code.as_str()) {
                     return Ok(return_bean);
                 }
                 Err(e)
@@ -69,9 +67,9 @@ impl TsmService for SeQueryRequest {
 impl SeQueryRequest {
     pub fn build_request_data(seid: String, sn: String, sdk_version: Option<String>) -> Self {
         SeQueryRequest {
-            seid: seid,
-            sn: sn,
-            sdk_version: sdk_version,
+            seid,
+            sn,
+            sdk_version,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_SE_QUERY),
diff --git a/imkey-core/ikc-device/src/se_secure_check.rs b/imkey-core/ikc-device/src/se_secure_check.rs
index 437babe1..134a723c 100644
--- a/imkey-core/ikc-device/src/se_secure_check.rs
+++ b/imkey-core/ikc-device/src/se_secure_check.rs
@@ -30,20 +30,18 @@ impl TsmService for SeSecureCheckRequest {
 
     fn send_message(&mut self) -> Result<()> {
         loop {
-            println!("send message：{:#?}", self);
             let req_data = serde_json::to_vec_pretty(&self).unwrap();
             let response_data = https::post(constants::TSM_ACTION_SE_SECURE_CHECK, req_data)?;
             let return_bean: ServiceResponse<SeSecureCheckResponse> =
                 serde_json::from_str(response_data.as_str())?;
-            println!("return message：{:#?}", return_bean);
-            if return_bean._ReturnCode == constants::TSM_RETURN_CODE_SUCCESS {
+            if return_bean.return_code == constants::TSM_RETURN_CODE_SUCCESS {
                 //check if end
-                let next_step_key = return_bean._ReturnData.next_step_key.unwrap();
+                let next_step_key = return_bean.return_data.next_step_key.unwrap();
                 if constants::TSM_END_FLAG.eq(next_step_key.as_str()) {
                     return Ok(());
                 }
 
-                match return_bean._ReturnData.apdu_list {
+                match return_bean.return_data.apdu_list {
                     Some(apdu_list) => {
                         let handle_result =
                             ServiceResponse::<SeSecureCheckResponse>::apdu_handle(apdu_list)?;
@@ -63,9 +61,9 @@ impl TsmService for SeSecureCheckRequest {
 impl SeSecureCheckRequest {
     pub fn build_request_data(seid: String, sn: String, device_cert: String) -> Self {
         SeSecureCheckRequest {
-            seid: seid,
-            sn: sn,
-            device_cert: device_cert,
+            seid,
+            sn,
+            device_cert,
             step_key: String::from("01"),
             status_word: None,
             command_id: String::from(constants::TSM_ACTION_SE_SECURE_CHECK),
diff --git a/imkey-core/ikc-proto/Cargo.toml b/imkey-core/ikc-proto/Cargo.toml
index d6c2d7fd..8dd51ff4 100644
--- a/imkey-core/ikc-proto/Cargo.toml
+++ b/imkey-core/ikc-proto/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.5.0"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
 
 [lib]
 name = "proto"
 
 [build-dependencies]
-prost-build = "0.6.1"
\ No newline at end of file
+prost-build = "=0.11.4"
\ No newline at end of file
diff --git a/imkey-core/ikc-proto/build.rs b/imkey-core/ikc-proto/build.rs
index 409c7e62..ca162fca 100644
--- a/imkey-core/ikc-proto/build.rs
+++ b/imkey-core/ikc-proto/build.rs
@@ -4,7 +4,7 @@ extern crate prost_build;
 fn main() {
     // tcx-api
     env::set_var("OUT_DIR", "../ikc/src");
-    prost_build::compile_protos(&["src/ikc.proto"], &["src/"]).unwrap();
+    prost_build::compile_protos(&["src/api.proto"], &["src/"]).unwrap();
 
     // common
     env::set_var("OUT_DIR", "../ikc-common/src");
diff --git a/imkey-core/ikc-proto/src/ikc.proto b/imkey-core/ikc-proto/src/api.proto
similarity index 61%
rename from imkey-core/ikc-proto/src/ikc.proto
rename to imkey-core/ikc-proto/src/api.proto
index e4852cf0..66a70a6e 100644
--- a/imkey-core/ikc-proto/src/ikc.proto
+++ b/imkey-core/ikc-proto/src/api.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package ikc;
+package api;
 
 import "google/protobuf/any.proto";
 
@@ -100,4 +100,67 @@ message BtcForkWallet {
     string chainType = 2;
     string address = 3;
     string encXPub = 4;
+}
+
+message DeriveAccountsParam {
+    message Derivation {
+        string chainType = 1;
+        string path = 2;
+        string network = 3;
+        string segWit = 4;
+        string chainId = 5;
+        string curve = 6;
+        string bech32Prefix = 7;
+    }
+    repeated Derivation derivations= 1;
+}
+
+message AccountResponse {
+    string chainType = 1;
+    string address = 2;
+    string path = 3;
+    string curve = 4;
+    string publicKey = 5;
+    string extendedPublicKey = 6;
+    string encryptedExtendedPublicKey = 7;
+    string segWit = 8;
+}
+
+message DeriveAccountsResult {
+    repeated AccountResponse accounts = 1;
+}
+
+message DeriveSubAccountsParam {
+    string chainType = 1;
+    string curve = 2;
+    string network = 3;
+    string segWit = 4;
+    repeated string relativePaths = 5;
+    string extendedPublicKey = 6;
+}
+
+message DeriveSubAccountsResult {
+    repeated AccountResponse accounts = 1;
+}
+
+message GetExtendedPublicKeysParam {
+    repeated PublicKeyDerivation derivations = 1;
+}
+
+message GetExtendedPublicKeysResult {
+    repeated string extendedPublicKeys = 1;
+}
+
+message PublicKeyDerivation {
+    string chainType = 1;
+    string path = 2;
+    string curve = 3;
+}
+
+message GetPublicKeysParam {
+    repeated PublicKeyDerivation derivations = 1;
+}
+
+message GetPublicKeysResult {
+    repeated string publicKeys = 1;
 }
\ No newline at end of file
diff --git a/imkey-core/ikc-proto/src/btc.proto b/imkey-core/ikc-proto/src/btc.proto
index 076b4965..cf4b9c1e 100644
--- a/imkey-core/ikc-proto/src/btc.proto
+++ b/imkey-core/ikc-proto/src/btc.proto
@@ -32,14 +32,3 @@ message BtcTxOutput {
     string txHash = 2;
     string wtxHash = 3;
 }
-
-message BtcXpubReq {
-    string network = 1;
-    string path = 2;
-}
-
-message BtcXpubRes {
-    string xpub = 1;
-}
-
-
diff --git a/imkey-core/ikc-transport/Cargo.toml b/imkey-core/ikc-transport/Cargo.toml
index b9f83e54..4b379bf3 100644
--- a/imkey-core/ikc-transport/Cargo.toml
+++ b/imkey-core/ikc-transport/Cargo.toml
@@ -7,12 +7,13 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-parking_lot = "0.12.1"
-lazy_static = "1.4.0"
-hex = "0.4.3"
-failure = "0.1.8"
+parking_lot = "=0.12.1"
+lazy_static = "=1.4.0"
+hex = "=0.4.3"
+anyhow = "=1.0.79"
+thiserror = "=1.0.56"
 [target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))'.dependencies]
-hidapi = "2.0.2"
+hidapi = "=2.0.2"
 [dev-dependencies.cargo-husky]
 version = "1"
 default-features = false
diff --git a/imkey-core/ikc-transport/src/error.rs b/imkey-core/ikc-transport/src/error.rs
index 88f9378d..4b3ee75e 100644
--- a/imkey-core/ikc-transport/src/error.rs
+++ b/imkey-core/ikc-transport/src/error.rs
@@ -1,9 +1,11 @@
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+use thiserror::Error;
+
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum HidError {
-    #[fail(display = "imkey_device_not_connect")]
+    #[error("imkey_device_not_connect")]
     DeviceIsNotConnectOrNoVerifyPin,
-    #[fail(display = "device_connect_interface_not_called")]
+    #[error("device_connect_interface_not_called")]
     DeviceConnectInterfaceNotCalled,
-    #[fail(display = "device_data_read_time_out")]
+    #[error("device_data_read_time_out")]
     DeviceDataReadTimeOut,
 }
diff --git a/imkey-core/ikc-transport/src/hid_api.rs b/imkey-core/ikc-transport/src/hid_api.rs
index d3c8416c..7571a6ec 100644
--- a/imkey-core/ikc-transport/src/hid_api.rs
+++ b/imkey-core/ikc-transport/src/hid_api.rs
@@ -21,18 +21,14 @@ pub fn hid_send(apdu: &String, timeout: i32) -> Result<String> {
     //get hid_device obj
     let hid_device_obj: &Vec<HidDevice> = &HID_DEVICE.lock();
     if hid_device_obj.is_empty() {
-        drop(hid_device_obj);
         return Err(HidError::DeviceConnectInterfaceNotCalled.into());
     }
-    // println!("-->{}", apdu);
     send_device_message(
         &hid_device_obj.get(0).unwrap(),
         Vec::from_hex(apdu.as_str()).unwrap().as_slice(),
     )?;
     let return_data = read_device_response(&hid_device_obj.get(0).unwrap(), timeout)?;
-    //    drop(hid_device_obj);
     let apdu_response = hex::encode_upper(return_data);
-    // println!("<--{}", apdu_response.clone());
     Ok(apdu_response)
 }
 
diff --git a/imkey-core/ikc-transport/src/lib.rs b/imkey-core/ikc-transport/src/lib.rs
index fd7da023..0503490f 100644
--- a/imkey-core/ikc-transport/src/lib.rs
+++ b/imkey-core/ikc-transport/src/lib.rs
@@ -2,12 +2,8 @@ pub mod error;
 #[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
 pub mod hid_api;
 pub mod message;
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-//#[macro_use]
-////extern crate log;
+pub type Result<T> = result::Result<T, anyhow::Error>;
 #[macro_use]
 extern crate lazy_static;
diff --git a/imkey-core/ikc-transport/src/message.rs b/imkey-core/ikc-transport/src/message.rs
index c5f09023..93ea4c40 100644
--- a/imkey-core/ikc-transport/src/message.rs
+++ b/imkey-core/ikc-transport/src/message.rs
@@ -1,6 +1,7 @@
 #[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
 use super::hid_api;
 use crate::Result;
+use anyhow::anyhow;
 use parking_lot::Mutex;
 use parking_lot::RwLock;
 use std::ffi::{CStr, CString};
@@ -37,7 +38,7 @@ pub fn set_callback(callback: extern "C" fn(apdu: *const c_char, timeout: i32) -
 
 pub fn get_apdu() -> *const c_char {
     let apdu = APDU.read();
-    return CString::new(apdu.to_owned()).unwrap().into_raw();
+    CString::new(apdu.to_owned()).unwrap().into_raw()
 }
 
 #[allow(dead_code)]
@@ -48,7 +49,7 @@ fn set_apdu_r(apdu: String) {
         if *_apdu == "" {
             //debug!("is null set");
             println!("is null set");
-            *_apdu = String::from(apdu.clone());
+            *_apdu = apdu;
             break;
         } else {
             println!("not null...{}", _apdu);
@@ -57,12 +58,11 @@ fn set_apdu_r(apdu: String) {
     }
 }
 
-pub fn set_apdu(apdu: *const c_char) {
+pub unsafe fn set_apdu(apdu: *const c_char) {
     let mut _apdu = APDU.write();
     let c_str: &CStr = unsafe { CStr::from_ptr(apdu) };
     let str_slice: &str = c_str.to_str().unwrap();
     let str_buf: String = str_slice.to_owned();
-    //debug!("set_apdu...{}", str_buf);
     *_apdu = str_buf;
     drop(_apdu);
 }
@@ -78,34 +78,32 @@ fn get_apdu_return_r() -> Result<String> {
             println!("get_apdu_return_r not null {}", apdu_return.clone());
             let temp = apdu_return.clone();
             *apdu_return = String::from("");
-            return Ok(String::from(temp.to_owned()));
+            return Ok(String::from(temp));
         } else {
             println!("get_apdu_return_r is null {}", apdu_return.clone());
         }
         drop(apdu_return);
 
-        loop_count = loop_count + 1;
+        loop_count += 1;
         println!("loop time:{}", &loop_count);
         thread::sleep(Duration::from_millis(100));
         if loop_count >= loop_max {
             println!("timeout panic!");
-            return Err(format_err!("imkey_send_apdu_timeout"));
+            return Err(anyhow!("imkey_send_apdu_timeout"));
         }
     }
 }
 
 pub fn get_apdu_return() -> *const c_char {
     let apdu = APDU_RETURN.read();
-    //debug!("get_apdu_return...{}", apdu.clone());
-    return CString::new(apdu.to_owned()).unwrap().into_raw();
+    CString::new(apdu.to_owned()).unwrap().into_raw()
 }
 
-pub fn set_apdu_return(apdu_return: *const c_char) {
+pub unsafe fn set_apdu_return(apdu_return: *const c_char) {
     let mut _apdu_return = APDU_RETURN.write();
     let c_str: &CStr = unsafe { CStr::from_ptr(apdu_return) };
     let str_slice: &str = c_str.to_str().unwrap();
     let str_buf: String = str_slice.to_owned();
-    //debug!("set_apdu_return...{}", str_buf);
     *_apdu_return = str_buf;
     drop(_apdu_return);
 }
@@ -137,7 +135,7 @@ pub fn send_apdu_timeout(apdu: String, timeout: i32) -> Result<String> {
     // let prefix = "communication_error_";
     // if res.starts_with(prefix){
     //     let error = &res[..prefix.len()-1];
-    //     return Err(format_err!("{}", error))
+    //     return Err(anyhow!("{}", error))
     // }else {
     //     return Ok(res)
     // }
@@ -148,7 +146,7 @@ pub fn send_apdu_timeout(apdu: String, timeout: i32) -> Result<String> {
         return if res.starts_with(prefix) {
             let error = &res[prefix.len()..];
             println!("{}", error);
-            Err(format_err!("{}", error))
+            Err(anyhow!("{}", error))
         } else {
             println!("{}", res);
             Ok(res)
@@ -158,15 +156,15 @@ pub fn send_apdu_timeout(apdu: String, timeout: i32) -> Result<String> {
 
 #[test]
 fn test_rwlock() {
-    let r1 = TEST.read().unwrap();
+    let r1 = TEST.read();
     println!("test:{}", *r1);
 
-    let r2 = TEST.read().unwrap();
+    let r2 = TEST.read();
     println!("test:{}", *r2);
     drop(r1);
     drop(r2);
 
-    let mut w = TEST.write().unwrap();
+    let mut w = TEST.write();
     *w = "haha".to_string();
     println!("test:{}", *w);
     drop(w);
@@ -174,7 +172,7 @@ fn test_rwlock() {
 
 #[test]
 fn test_callback() {
-    let callback = CALLBACK.lock().unwrap();
+    let callback = CALLBACK.lock();
     let ptr = callback(
         CString::new("00A4040000".to_owned()).unwrap().into_raw(),
         20,
diff --git a/imkey-core/ikc-wallet/coin-bch/Cargo.toml b/imkey-core/ikc-wallet/coin-bch/Cargo.toml
index abe12ec6..0ec8a606 100644
--- a/imkey-core/ikc-wallet/coin-bch/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-bch/Cargo.toml
@@ -11,18 +11,17 @@ ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
 
-bch_addr = "0.1.0"
-bitcoin = "0.29.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-bip39 = "1.0.0"
-#bitcoinconsensus = { version = "0.16", optional = true }
-failure = "0.1.8"
-hex = "0.4.3"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.89"
-bitcoin_hashes = "0.11.0"
-num-bigint = "0.4.3"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
+bch_addr = "=0.1.0"
+bitcoin = "=0.29.2"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+tiny-bip39 = "=1.0.0"
+anyhow = "=1.0.79"
+hex = "=0.4.3"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+bitcoin_hashes = "=0.11.0"
+num-bigint = "=0.4.3"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
 
diff --git a/imkey-core/ikc-wallet/coin-bch/src/address.rs b/imkey-core/ikc-wallet/coin-bch/src/address.rs
index 72625a56..ed7ea201 100644
--- a/imkey-core/ikc-wallet/coin-bch/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-bch/src/address.rs
@@ -14,6 +14,7 @@ use ikc_common::utility;
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message;
 
+use ikc_common::utility::network_convert;
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 
@@ -61,7 +62,7 @@ impl BchAddress {
         }
     }
 
-    pub fn get_pub_key(network: Network, path: &str) -> Result<String> {
+    pub fn get_pub_key(_network: Network, path: &str) -> Result<String> {
         //path check
         check_path_validity(path)?;
 
@@ -129,6 +130,14 @@ impl BchAddress {
             return false;
         }
     }
+
+    pub fn from_pub_key(pub_key: &[u8], network: &str) -> Result<String> {
+        let network = network_convert(network);
+        let mut pub_key_obj = PublicKey::from_slice(pub_key)?;
+        pub_key_obj.compressed = true;
+        let addr = BtcAddress::p2pkh(&pub_key_obj, network).to_string();
+        legacy_to_bch(&addr)
+    }
 }
 
 impl FromStr for BchAddress {
diff --git a/imkey-core/ikc-wallet/coin-bch/src/common.rs b/imkey-core/ikc-wallet/coin-bch/src/common.rs
index 08242573..716682ec 100644
--- a/imkey-core/ikc-wallet/coin-bch/src/common.rs
+++ b/imkey-core/ikc-wallet/coin-bch/src/common.rs
@@ -8,10 +8,10 @@ use bitcoin::util::bip32::{ChainCode, ChildNumber, ExtendedPubKey};
 use bitcoin::{Address, PublicKey};
 use ikc_common::apdu::{ApduCheck, BtcForkApdu, CoinCommonApdu};
 use ikc_common::error::CoinError;
-use ikc_common::utility::sha256_hash;
+use ikc_common::utility::{hex_to_bytes, sha256_hash};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::send_apdu;
-use secp256k1::{Message, PublicKey as Secp256k1PublicKey, Secp256k1, Signature};
+use secp256k1::{ecdsa::Signature, Message, PublicKey as Secp256k1PublicKey, Secp256k1};
 use std::convert::TryFrom;
 use std::str::FromStr;
 
@@ -26,48 +26,46 @@ pub fn address_verify(
 ) -> Result<Vec<String>> {
     let mut utxo_pub_key_vec: Vec<String> = vec![];
     for utxo in utxos {
-        //get utxo public key
-        let secp256k1_pubkey = Secp256k1PublicKey::from_str(public_key)?;
-        let public_key_obj = PublicKey {
-            compressed: true,
-            inner: secp256k1_pubkey,
-        };
-        //gen chain code obj
-        let chain_code_obj = ChainCode::try_from(chain_code)?;
-        //build extended public key
-        let mut extend_public_key = ExtendedPubKey {
-            network: network,
-            depth: 0,
-            parent_fingerprint: Default::default(),
-            child_number: ChildNumber::from_normal_idx(0)?,
-            public_key: secp256k1_pubkey,
-            chain_code: chain_code_obj,
-        };
-
-        let bitcoin_secp = BitcoinSecp256k1::new();
-
-        let se_gen_address_str = if utxo.derive_path.is_empty() {
-            Address::p2pkh(&public_key_obj, network).to_string()
+        let (se_gen_address_str, extend_public_key) = if utxo.derive_path.is_empty() {
+            let secp256k1_pubkey = Secp256k1PublicKey::from_str(public_key)?;
+            let public_key_obj = PublicKey {
+                compressed: true,
+                inner: secp256k1_pubkey,
+            };
+            let chain_code_obj = ChainCode::try_from(chain_code)?;
+            (
+                Address::p2pkh(&public_key_obj, network).to_string(),
+                ExtendedPubKey {
+                    network,
+                    depth: 0,
+                    parent_fingerprint: Default::default(),
+                    child_number: ChildNumber::from_normal_idx(0)?,
+                    public_key: secp256k1_pubkey,
+                    chain_code: chain_code_obj,
+                },
+            )
         } else {
-            let index_number_vec: Vec<&str> = utxo.derive_path.as_str().split('/').collect();
-
-            for index_number in index_number_vec {
-                let test_chain_number =
-                    ChildNumber::from_normal_idx(index_number.parse().unwrap())?;
-                extend_public_key = extend_public_key.ckd_pub(&bitcoin_secp, test_chain_number)?;
-            }
-            Address::p2pkh(
-                &PublicKey::from_str(extend_public_key.public_key.to_string().as_str())?,
+            let xpub_data = get_xpub_data(&utxo.derive_path, false)?;
+            let public_key = &xpub_data[..130];
+            let chain_code = &xpub_data[130..194];
+            let extend_public_key = ExtendedPubKey {
                 network,
+                depth: 0,
+                parent_fingerprint: Default::default(),
+                child_number: ChildNumber::from_normal_idx(0)?,
+                public_key: Secp256k1PublicKey::from_str(public_key)?,
+                chain_code: ChainCode::from(hex_to_bytes(chain_code)?.as_slice()),
+            };
+
+            (
+                Address::p2pkh(
+                    &PublicKey::from_str(extend_public_key.public_key.to_string().as_str())?,
+                    network,
+                )
+                .to_string(),
+                extend_public_key,
             )
-            .to_string()
         };
-        // //verify address
-        // let se_gen_address_str = Address::p2pkh(
-        //     &PublicKey::from_str(extend_public_key.public_key.to_string().as_str())?,
-        //     network,
-        // )
-        // .to_string();
 
         let utxo_address = utxo.address.clone();
         let bch_address = BchAddress::convert_to_legacy_if_need(utxo_address.as_ref())?;
@@ -80,13 +78,13 @@ pub fn address_verify(
     Ok(utxo_pub_key_vec)
 }
 
-/**
-Transaction type identification
-*/
-pub enum TransTypeFlg {
-    BTC,
-    SEGWIT,
-}
+// /**
+// Transaction type identification
+// */
+// pub enum TransTypeFlg {
+//     BTC,
+//     SEGWIT,
+// }
 
 /**
 get xpub
@@ -115,7 +113,9 @@ pub fn apdu_sign_verify(signed: &[u8], message: &[u8]) -> Result<bool> {
     let mut sig_obj = Signature::from_der(signed)?;
     sig_obj.normalize_s();
     //verify
-    Ok(secp.verify(&message_obj, &sig_obj, &public_obj).is_ok())
+    Ok(secp
+        .verify_ecdsa(&message_obj, &sig_obj, &public_obj)
+        .is_ok())
 }
 
 /**
diff --git a/imkey-core/ikc-wallet/coin-bch/src/lib.rs b/imkey-core/ikc-wallet/coin-bch/src/lib.rs
index 488939e3..feabdeaf 100644
--- a/imkey-core/ikc-wallet/coin-bch/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-bch/src/lib.rs
@@ -3,13 +3,5 @@ use core::result;
 pub mod address;
 mod common;
 pub mod transaction;
-pub type Result<T> = result::Result<T, failure::Error>;
-extern crate failure;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
+extern crate anyhow;
diff --git a/imkey-core/ikc-wallet/coin-bch/src/transaction.rs b/imkey-core/ikc-wallet/coin-bch/src/transaction.rs
index 0f4afcf3..7ded7094 100644
--- a/imkey-core/ikc-wallet/coin-bch/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-bch/src/transaction.rs
@@ -19,7 +19,7 @@ use ikc_common::path::check_path_validity;
 use ikc_common::utility::{bigint_to_byte_vec, secp256k1_sign};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
-use secp256k1::Signature;
+use secp256k1::ecdsa::Signature;
 use std::str::FromStr;
 
 #[derive(Clone)]
@@ -189,7 +189,7 @@ impl BchTransaction {
             //lock script
             let pub_key_bytes = hex::decode(utxo_pub_key_vec.get(index).unwrap())?;
             let pub_key_hash = hash160::Hash::hash(&pub_key_bytes).into_inner();
-            let script_hex = format!("76a914{}88ac", hex::encode(pub_key_hash));
+            let script_hex: String = format!("76a914{}88ac", hex::encode(pub_key_hash));
             // let script = Script::from(hex::decode(script_hex)?);
             let script = Script::from_hex(script_hex.as_str())?;
             let script_data = serialize(&script);
@@ -208,10 +208,13 @@ impl BchTransaction {
             data.insert(0, data.len() as u8);
             //address
             let mut address_data: Vec<u8> = vec![];
-            let sign_path = format!("{}{}", path_str, unspent.derive_path);
-            address_data.push(sign_path.as_bytes().len() as u8);
-            address_data.extend_from_slice(sign_path.as_bytes());
-
+            if unspent.derive_path.is_empty() {
+                address_data.push(path_str.as_bytes().len() as u8);
+                address_data.extend_from_slice(path_str.as_bytes());
+            } else {
+                address_data.push(unspent.derive_path.as_bytes().len() as u8);
+                address_data.extend_from_slice(unspent.derive_path.as_bytes());
+            }
             data.extend(address_data.iter());
             if index == self.unspents.len() - 1 {
                 sign_apdu_vec.push(BtcForkApdu::btc_fork_segwit_sign(0x48, true, 0x01, data));
@@ -362,7 +365,7 @@ mod tests {
             amount: 100000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -398,7 +401,7 @@ mod tests {
             amount: 100000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo2 = Utxo {
@@ -407,7 +410,7 @@ mod tests {
             amount: 500000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -444,7 +447,7 @@ mod tests {
             amount: 100000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo2 = Utxo {
@@ -453,7 +456,7 @@ mod tests {
             amount: 500000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -490,7 +493,7 @@ mod tests {
             amount: 100000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo2 = Utxo {
@@ -499,7 +502,7 @@ mod tests {
             amount: 500000,
             address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
             script_pubkey: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/145'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/Cargo.toml b/imkey-core/ikc-wallet/coin-bitcoin/Cargo.toml
index e8c802ef..208aafa0 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-bitcoin/Cargo.toml
@@ -10,13 +10,12 @@ edition = "2018"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-bitcoin = "0.29.2"
-hex = "0.4.3"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-ring = "0.16.20"
-bitcoin_hashes = "0.11.0"
-num-bigint = "0.4.3"
-failure = "0.1.8"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
\ No newline at end of file
+bitcoin = "=0.29.2"
+hex = "=0.4.3"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+bitcoin_hashes = "=0.11.0"
+num-bigint = "=0.4.3"
+anyhow = "=1.0.79"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/src/address.rs b/imkey-core/ikc-wallet/coin-bitcoin/src/address.rs
index 5c3dbbf1..dcb091f0 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-bitcoin/src/address.rs
@@ -101,6 +101,17 @@ impl BtcAddress {
         Ok(Address::p2shwpkh(&pub_key_obj, network)?.to_string())
     }
 
+    pub fn get_pub_key(path: &str) -> Result<String> {
+        //path check
+        check_path_validity(path)?;
+
+        //get xpub
+        let xpub_data = get_xpub_data(path, true)?;
+        let pub_key = &xpub_data[..130];
+
+        Ok(pub_key.to_string())
+    }
+
     /**
     get parent public key path
     */
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/src/btcapi.rs b/imkey-core/ikc-wallet/coin-bitcoin/src/btcapi.rs
index df3c5a82..f9217c83 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/src/btcapi.rs
+++ b/imkey-core/ikc-wallet/coin-bitcoin/src/btcapi.rs
@@ -1,33 +1,36 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Utxo {
     #[prost(string, tag = "1")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
     #[prost(int32, tag = "2")]
     pub vout: i32,
     #[prost(int64, tag = "3")]
     pub amount: i64,
     #[prost(string, tag = "4")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub script_pub_key: std::string::String,
+    pub script_pub_key: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
-    pub derived_path: std::string::String,
+    pub derived_path: ::prost::alloc::string::String,
     #[prost(int64, tag = "7")]
     pub sequence: i64,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BtcTxExtra {
     #[prost(string, tag = "1")]
-    pub op_return: std::string::String,
+    pub op_return: ::prost::alloc::string::String,
     #[prost(int32, tag = "2")]
     pub property_id: i32,
     #[prost(string, tag = "3")]
-    pub fee_mode: std::string::String,
+    pub fee_mode: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BtcTxInput {
     #[prost(string, tag = "1")]
-    pub to: std::string::String,
+    pub to: ::prost::alloc::string::String,
     #[prost(int64, tag = "2")]
     pub amount: i64,
     #[prost(int64, tag = "3")]
@@ -35,32 +38,21 @@ pub struct BtcTxInput {
     #[prost(uint32, tag = "4")]
     pub change_address_index: u32,
     #[prost(message, repeated, tag = "5")]
-    pub unspents: ::std::vec::Vec<Utxo>,
+    pub unspents: ::prost::alloc::vec::Vec<Utxo>,
     #[prost(string, tag = "6")]
-    pub seg_wit: std::string::String,
+    pub seg_wit: ::prost::alloc::string::String,
     #[prost(string, tag = "7")]
-    pub protocol: std::string::String,
+    pub protocol: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "8")]
-    pub extra: ::std::option::Option<BtcTxExtra>,
+    pub extra: ::core::option::Option<BtcTxExtra>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BtcTxOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub wtx_hash: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BtcXpubReq {
-    #[prost(string, tag = "1")]
-    pub network: std::string::String,
-    #[prost(string, tag = "2")]
-    pub path: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BtcXpubRes {
-    #[prost(string, tag = "1")]
-    pub xpub: std::string::String,
+    pub wtx_hash: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/src/common.rs b/imkey-core/ikc-wallet/coin-bitcoin/src/common.rs
index 934d0ed4..d269bb86 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/src/common.rs
+++ b/imkey-core/ikc-wallet/coin-bitcoin/src/common.rs
@@ -1,14 +1,13 @@
 use crate::transaction::Utxo;
 use crate::Result;
-use bitcoin::secp256k1::Secp256k1 as BitcoinSecp256k1;
 use bitcoin::util::base58;
 use bitcoin::util::bip32::{ChainCode, ChildNumber, ExtendedPubKey};
 use bitcoin::{Address, Network, PublicKey};
 use ikc_common::apdu::{ApduCheck, BtcApdu, CoinCommonApdu};
 use ikc_common::error::CoinError;
-use ikc_common::utility::sha256_hash;
+use ikc_common::utility::{hex_to_bytes, sha256_hash};
 use ikc_transport::message::send_apdu;
-use secp256k1::{Message, PublicKey as Secp256k1PublicKey, Secp256k1, Signature};
+use secp256k1::{ecdsa::Signature, Message, PublicKey as Secp256k1PublicKey, Secp256k1};
 use std::str::FromStr;
 
 /**
@@ -16,33 +15,25 @@ utxo address verify
 */
 pub fn address_verify(
     utxos: &Vec<Utxo>,
-    public_key: &str,
-    chain_code: &[u8],
     network: Network,
     trans_type_flg: TransTypeFlg,
 ) -> Result<Vec<String>> {
     let mut utxo_pub_key_vec: Vec<String> = vec![];
     for utxo in utxos {
-        //get utxo public key
-        let public_key_obj = Secp256k1PublicKey::from_str(public_key)?;
-        //gen chain code obj
-        let chain_code_obj = ChainCode::from(chain_code);
-        //build extended public key
+        //get xpub and sign data
+        let xpub_data = get_xpub_data(&utxo.derive_path, false)?;
+        //parsing xpub data
+        let public_key = &xpub_data[..130];
+        let chain_code = &xpub_data[130..194];
         let mut extend_public_key = ExtendedPubKey {
-            network: network,
+            network,
             depth: 0,
             parent_fingerprint: Default::default(),
             child_number: ChildNumber::from_normal_idx(0)?,
-            public_key: public_key_obj,
-            chain_code: chain_code_obj,
+            public_key: Secp256k1PublicKey::from_str(public_key)?,
+            chain_code: ChainCode::from(hex_to_bytes(chain_code)?.as_slice()),
         };
 
-        let bitcoin_secp = BitcoinSecp256k1::new();
-        let index_number_vec: Vec<&str> = utxo.derive_path.as_str().split('/').collect();
-        for index_number in index_number_vec {
-            let test_chain_number = ChildNumber::from_normal_idx(index_number.parse().unwrap())?;
-            extend_public_key = extend_public_key.ckd_pub(&bitcoin_secp, test_chain_number)?;
-        }
         //verify address
         let se_gen_address: Result<String> = match trans_type_flg {
             TransTypeFlg::BTC => Ok(Address::p2pkh(
@@ -99,7 +90,9 @@ pub fn secp256k1_sign_verify(public: &[u8], signed: &[u8], message: &[u8]) -> Re
     let mut sig_obj = Signature::from_der(signed)?;
     sig_obj.normalize_s();
     //verify
-    Ok(secp.verify(&message_obj, &sig_obj, &public_obj).is_ok())
+    Ok(secp
+        .verify_ecdsa(&message_obj, &sig_obj, &public_obj)
+        .is_ok())
 }
 
 /**
@@ -135,7 +128,6 @@ pub struct TxSignResult {
 #[cfg(test)]
 mod test {
     use crate::common::get_address_version;
-    use crate::transaction::Utxo;
     use bitcoin::Network;
 
     #[test]
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/src/lib.rs b/imkey-core/ikc-wallet/coin-bitcoin/src/lib.rs
index 004c7f2b..b1e432af 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-bitcoin/src/lib.rs
@@ -3,14 +3,6 @@ pub mod btcapi;
 pub mod common;
 pub mod transaction;
 pub mod usdt_transaction;
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/src/transaction.rs b/imkey-core/ikc-wallet/coin-bitcoin/src/transaction.rs
index ff6ecbf7..6af419b1 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-bitcoin/src/transaction.rs
@@ -1,20 +1,15 @@
 use crate::address::BtcAddress;
-use crate::common::{
-    address_verify, get_address_version, get_xpub_data, secp256k1_sign_verify, TransTypeFlg,
-    TxSignResult,
-};
+use crate::common::{address_verify, get_address_version, TransTypeFlg, TxSignResult};
 use crate::Result;
 use bitcoin::blockdata::{opcodes, script::Builder};
 use bitcoin::consensus::{serialize, Encodable};
 use bitcoin::hashes::hex::FromHex;
-use bitcoin::util::psbt::serialize::Serialize;
 use bitcoin::{
-    Address, EcdsaSighashType, Network, OutPoint, PackedLockTime, Script, Sequence, SigHashType,
-    Transaction, TxIn, TxOut, Witness,
+    Address, EcdsaSighashType, Network, OutPoint, PackedLockTime, Script, Sequence, Transaction,
+    TxIn, TxOut, Witness,
 };
 use bitcoin_hashes::hash160;
 use bitcoin_hashes::hex::ToHex;
-use bitcoin_hashes::sha256d::Hash as Hash256;
 use bitcoin_hashes::Hash;
 use ikc_common::apdu::{ApduCheck, BtcApdu};
 use ikc_common::constants::{
@@ -25,7 +20,7 @@ use ikc_common::path::check_path_validity;
 use ikc_common::utility::{bigint_to_byte_vec, hex_to_bytes, secp256k1_sign};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
-use secp256k1::Signature;
+use secp256k1::ecdsa::Signature;
 use std::str::FromStr;
 
 #[derive(Clone)]
@@ -65,35 +60,8 @@ impl BtcTransaction {
             return Err(CoinError::ImkeyExceededMaxUtxoNumber.into());
         }
 
-        //get xpub and sign data
-        let xpub_data = get_xpub_data(path_str.as_str(), true)?;
-        let xpub_data = &xpub_data[..xpub_data.len() - 4].to_string();
-
-        //parsing xpub data
-        let sign_source_val = &xpub_data[..194];
-        let sign_result = &xpub_data[194..];
-        let pub_key = &sign_source_val[..130];
-        let chain_code = &sign_source_val[130..];
-
-        //use se public key verify sign
-        let key_manager_obj = KEY_MANAGER.lock();
-        let sign_verify_result = secp256k1_sign_verify(
-            &key_manager_obj.se_pub_key.as_slice(),
-            hex::decode(sign_result).unwrap().as_slice(),
-            hex::decode(sign_source_val).unwrap().as_slice(),
-        );
-        if sign_verify_result.is_err() || !sign_verify_result.ok().unwrap() {
-            return Err(CoinError::ImkeySignatureVerifyFail.into());
-        }
-
         //utxo address verify
-        let utxo_pub_key_vec = address_verify(
-            &self.unspents,
-            pub_key,
-            hex::decode(chain_code).unwrap().as_slice(),
-            network,
-            TransTypeFlg::BTC,
-        )?;
+        let utxo_pub_key_vec = address_verify(&self.unspents, network, TransTypeFlg::BTC)?;
 
         //calc utxo total amount
         if self.get_total_amount() < self.amount {
@@ -159,6 +127,7 @@ impl BtcTransaction {
         output_serialize_data.insert(0, 0x01);
 
         //use local private key sign data
+        let key_manager_obj = KEY_MANAGER.lock();
         let mut output_pareper_data =
             secp256k1_sign(&key_manager_obj.pri_key, &output_serialize_data)?;
         output_pareper_data.insert(0, output_pareper_data.len() as u8);
@@ -202,7 +171,7 @@ impl BtcTransaction {
                 let btc_sign_apdu = BtcApdu::btc_sign(
                     y as u8,
                     EcdsaSighashType::All.to_u32() as u8,
-                    format!("{}{}", path_str, self.unspents.get(y).unwrap().derive_path).as_str(),
+                    self.unspents.get(y).unwrap().derive_path.as_str(),
                 );
                 //sign data
                 let btc_sign_apdu_return = send_apdu(btc_sign_apdu)?;
@@ -258,31 +227,11 @@ impl BtcTransaction {
             return Err(CoinError::ImkeyExceededMaxUtxoNumber.into());
         }
 
-        //get xpub and sign data
-        let xpub_data = get_xpub_data(path_str.as_str(), true)?;
-        let xpub_data = &xpub_data[..xpub_data.len() - 4].to_string();
-
-        //parsing xpub data
-        let sign_source_val = &xpub_data[..194];
-        let sign_result = &xpub_data[194..];
-        let pub_key = &sign_source_val[..130];
-        let chain_code = &sign_source_val[130..];
-
-        //use se public key verify sign
-        let key_manager_obj = KEY_MANAGER.lock();
-        let sign_verify_result = secp256k1_sign_verify(
-            &key_manager_obj.se_pub_key.as_slice(),
-            hex::decode(sign_result).unwrap().as_slice(),
-            hex::decode(sign_source_val).unwrap().as_slice(),
-        );
-        if sign_verify_result.is_err() || !sign_verify_result.ok().unwrap() {
-            return Err(CoinError::ImkeySignatureVerifyFail.into());
-        }
         //utxo address verify
         let utxo_pub_key_vec = address_verify(
             &self.unspents,
-            pub_key,
-            hex::decode(chain_code).unwrap().as_slice(),
+            // pub_key,
+            // hex::decode(chain_code).unwrap().as_slice(),
             network,
             TransTypeFlg::SEGWIT,
         )?;
@@ -351,6 +300,7 @@ impl BtcTransaction {
         output_serialize_data.insert(0, 0x01);
 
         //use local private key sign data
+        let key_manager_obj = KEY_MANAGER.lock();
         let mut output_pareper_data =
             secp256k1_sign(&key_manager_obj.pri_key, &output_serialize_data)?;
         output_pareper_data.insert(0, output_pareper_data.len() as u8);
@@ -407,9 +357,10 @@ impl BtcTransaction {
             data.insert(0, data.len() as u8);
             //address
             let mut address_data: Vec<u8> = vec![];
-            let sign_path = format!("{}{}", path_str, unspent.derive_path);
-            address_data.push(sign_path.as_bytes().len() as u8);
-            address_data.extend_from_slice(sign_path.as_bytes());
+            // let sign_path = format!("{}{}", path_str, unspent.derive_path);
+            let sign_path = unspent.derive_path.as_bytes();
+            address_data.push(sign_path.len() as u8);
+            address_data.extend_from_slice(sign_path);
 
             data.extend(address_data.iter());
             if index == self.unspents.len() - 1 {
@@ -535,12 +486,8 @@ mod tests {
     use crate::transaction::{BtcTransaction, Utxo};
     use bitcoin::{Address, Network};
     use hex::FromHex;
-    use std::str::FromStr;
-
-    use ikc_common::error::CoinError;
     use ikc_device::device_binding::bind_test;
-    use ikc_device::device_binding::DeviceManage;
-    use ikc_transport::hid_api::hid_connect;
+    use std::str::FromStr;
 
     #[test]
     fn test_sign_transaction() {
@@ -554,7 +501,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("mh7jj2ELSQUvRQELbn9qyA4q5nADhmJmUC").unwrap(),
             script_pubkey: "76a914118c3123196e030a8a607c22bafc1577af61497d88ac".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/44'/1'/0'/0/22".to_string(),
             sequence: 4294967295,
         };
         let utxo2 = Utxo {
@@ -563,7 +510,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN").unwrap(),
             script_pubkey: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/1'/0'/0/0".to_string(),
             sequence: 4294967295,
         };
         let utxo3 = Utxo {
@@ -572,7 +519,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN").unwrap(),
             script_pubkey: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/1'/0'/0/0".to_string(),
             sequence: 4294967295,
         };
         let utxo4 = Utxo {
@@ -581,7 +528,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN").unwrap(),
             script_pubkey: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/1'/0'/0/0".to_string(),
             sequence: 4294967295,
         };
         let mut utxos = Vec::new();
@@ -625,7 +572,7 @@ mod tests {
             amount: 50000,
             address: Address::from_str("2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/1'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo2 = Utxo {
@@ -634,7 +581,7 @@ mod tests {
             amount: 50000,
             address: Address::from_str("2N54wJxopnWTvBfqgAPVWqXVEdaqoH7Suvf").unwrap(),
             script_pubkey: "a91481af6d803fdc6dca1f3a1d03f5ffe8124cd1b44787".to_string(),
-            derive_path: "0/1".to_string(),
+            derive_path: "m/49'/1'/0'/0/1".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -674,7 +621,7 @@ mod tests {
             amount: 10000112345678,
             address: Address::from_str("1Fj93kpLwM1KgTN6C75Z5Bokhays4MmJae").unwrap(),
             script_pubkey: "76a914a189f2f7836812aa7a0e36e28a20a10e64010bf688ac".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/44'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -714,7 +661,7 @@ mod tests {
             amount: 10000112345678,
             address: Address::from_str("1Fj93kpLwM1KgTN6C75Z5Bokhays4MmJae").unwrap(),
             script_pubkey: "76a914a189f2f7836812aa7a0e36e28a20a10e64010bf688ac".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/44'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -746,7 +693,7 @@ mod tests {
             amount: 10000000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -783,7 +730,7 @@ mod tests {
             amount: 10000112345678,
             address: Address::from_str("1Fj93kpLwM1KgTN6C75Z5Bokhays4MmJae").unwrap(),
             script_pubkey: "76a914a189f2f7836812aa7a0e36e28a20a10e64010bf688ac".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/44'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -813,7 +760,7 @@ mod tests {
             amount: 500000,
             address: Address::from_str("2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/1'/0'/0/0".to_string(),
             sequence: 0,
         };
 
@@ -851,7 +798,7 @@ mod tests {
             amount: 1012345678,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -889,7 +836,7 @@ mod tests {
             amount: 1012345678,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/0'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
diff --git a/imkey-core/ikc-wallet/coin-bitcoin/src/usdt_transaction.rs b/imkey-core/ikc-wallet/coin-bitcoin/src/usdt_transaction.rs
index 35172e19..6279031f 100644
--- a/imkey-core/ikc-wallet/coin-bitcoin/src/usdt_transaction.rs
+++ b/imkey-core/ikc-wallet/coin-bitcoin/src/usdt_transaction.rs
@@ -7,14 +7,12 @@ use crate::Result;
 use bitcoin::blockdata::{opcodes, script::Builder};
 use bitcoin::consensus::{serialize, Encodable};
 use bitcoin::hashes::hex::FromHex;
-use bitcoin::util::psbt::serialize::Serialize;
 use bitcoin::{
-    EcdsaSighashType, Network, OutPoint, PackedLockTime, Script, Sequence, SigHashType,
-    Transaction, TxIn, TxOut, Witness,
+    EcdsaSighashType, Network, OutPoint, PackedLockTime, Script, Sequence, Transaction, TxIn,
+    TxOut, Witness,
 };
 use bitcoin_hashes::hash160;
 use bitcoin_hashes::hex::ToHex;
-use bitcoin_hashes::sha256d::Hash as Hash256;
 use bitcoin_hashes::Hash;
 use ikc_common::apdu::{ApduCheck, BtcApdu};
 use ikc_common::constants::{EACH_ROUND_NUMBER, MAX_UTXO_NUMBER, MIN_NONDUST_OUTPUT, TIMEOUT_LONG};
@@ -23,7 +21,7 @@ use ikc_common::path::check_path_validity;
 use ikc_common::utility::{bigint_to_byte_vec, hex_to_bytes, secp256k1_sign};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
-use secp256k1::Signature;
+use secp256k1::ecdsa::Signature;
 
 impl BtcTransaction {
     pub fn sign_omni_transaction(
@@ -48,34 +46,8 @@ impl BtcTransaction {
             return Err(CoinError::ImkeyAmountLessThanMinimum.into());
         }
 
-        //get xpub and sign data
-        let xpub_data = get_xpub_data(path_str.as_str(), true)?;
-        let xpub_data = &xpub_data[..xpub_data.len() - 4].to_string();
-        //get xpub data
-        let sign_source_val = &xpub_data[..194];
-        let sign_result = &xpub_data[194..];
-        let pub_key = &sign_source_val[..130];
-        let chain_code = &sign_source_val[130..];
-
-        //use se public key verify sign
-        let key_manager_obj = KEY_MANAGER.lock();
-        let sign_verify_result = secp256k1_sign_verify(
-            &key_manager_obj.se_pub_key.as_slice(),
-            hex::decode(sign_result).unwrap().as_slice(),
-            hex::decode(sign_source_val).unwrap().as_slice(),
-        );
-        if sign_verify_result.is_err() || !sign_verify_result.ok().unwrap() {
-            return Err(CoinError::ImkeySignatureVerifyFail.into());
-        }
-
         //utxo address verify
-        let utxo_pub_key_vec = address_verify(
-            &self.unspents,
-            pub_key,
-            hex::decode(chain_code).unwrap().as_slice(),
-            network,
-            TransTypeFlg::BTC,
-        )?;
+        let utxo_pub_key_vec = address_verify(&self.unspents, network, TransTypeFlg::BTC)?;
 
         //add change output
         let mut txouts: Vec<TxOut> = Vec::new();
@@ -134,6 +106,7 @@ impl BtcTransaction {
         output_serialize_data.insert(0, 0x01);
 
         //use local private key sign data
+        let key_manager_obj = KEY_MANAGER.lock();
         let mut output_pareper_data =
             secp256k1_sign(&key_manager_obj.pri_key, &output_serialize_data)?;
         output_pareper_data.insert(0, output_pareper_data.len() as u8);
@@ -175,7 +148,7 @@ impl BtcTransaction {
                 let btc_sign_apdu = BtcApdu::btc_sign(
                     y as u8,
                     EcdsaSighashType::All.to_u32() as u8,
-                    format!("{}{}", path_str, self.unspents.get(y).unwrap().derive_path).as_str(),
+                    self.unspents.get(y).unwrap().derive_path.as_str(),
                 );
                 //send sign apdu
                 let btc_sign_apdu_return = send_apdu(btc_sign_apdu)?;
@@ -234,35 +207,8 @@ impl BtcTransaction {
             return Err(CoinError::ImkeyAmountLessThanMinimum.into());
         }
 
-        //get xpub and sign data
-        let xpub_data = get_xpub_data(path_str.as_str(), true)?;
-        let xpub_data = &xpub_data[..xpub_data.len() - 4].to_string();
-
-        //get xpub data
-        let sign_source_val = &xpub_data[..194];
-        let sign_result = &xpub_data[194..];
-        let pub_key = &sign_source_val[..130];
-        let chain_code = &sign_source_val[130..];
-
-        //use se public key verify sign
-        let key_manager_obj = KEY_MANAGER.lock();
-        let sign_verify_result = secp256k1_sign_verify(
-            &key_manager_obj.se_pub_key.as_slice(),
-            hex::decode(sign_result).unwrap().as_slice(),
-            hex::decode(sign_source_val).unwrap().as_slice(),
-        );
-        if sign_verify_result.is_err() || !sign_verify_result.ok().unwrap() {
-            return Err(CoinError::ImkeySignatureVerifyFail.into());
-        }
-
         //utxo address verify
-        let utxo_pub_key_vec = address_verify(
-            &self.unspents,
-            pub_key,
-            hex::decode(chain_code).unwrap().as_slice(),
-            network,
-            TransTypeFlg::SEGWIT,
-        )?;
+        let utxo_pub_key_vec = address_verify(&self.unspents, network, TransTypeFlg::SEGWIT)?;
 
         //5.add change output
         let mut txouts: Vec<TxOut> = vec![];
@@ -314,6 +260,7 @@ impl BtcTransaction {
         output_serialize_data.insert(0, output_serialize_data.len() as u8);
         output_serialize_data.insert(0, 0x01);
         //use local private key sign data
+        let key_manager_obj = KEY_MANAGER.lock();
         let mut output_pareper_data =
             secp256k1_sign(&key_manager_obj.pri_key, &output_serialize_data)?;
         output_pareper_data.insert(0, output_pareper_data.len() as u8);
@@ -371,9 +318,9 @@ impl BtcTransaction {
 
             //address
             let mut address_data: Vec<u8> = vec![];
-            let sign_path = format!("{}{}", path_str, unspent.derive_path);
-            address_data.push(sign_path.as_bytes().len() as u8);
-            address_data.extend_from_slice(sign_path.as_bytes());
+            let sign_path = unspent.derive_path.as_bytes();
+            address_data.push(sign_path.len() as u8);
+            address_data.extend_from_slice(sign_path);
 
             data.extend(address_data.iter());
             if index == self.unspents.len() - 1 {
@@ -478,8 +425,6 @@ mod tests {
     use std::str::FromStr;
 
     use ikc_device::device_binding::bind_test;
-    use ikc_device::device_binding::DeviceManage;
-    use ikc_transport::hid_api::hid_connect;
 
     #[test]
     fn test_sign_transaction() {
@@ -492,7 +437,7 @@ mod tests {
             amount: 14824854,
             address: Address::from_str("mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN").unwrap(),
             script_pubkey: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/1'/0'/0/0".to_string(),
             sequence: 4294967295,
         };
         let mut utxos = Vec::new();
@@ -530,7 +475,7 @@ mod tests {
             amount: 21863396,
             address: Address::from_str("2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/1'/0'/0/0".to_string(),
             sequence: 0,
         };
 
@@ -569,7 +514,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let utxo2 = Utxo {
@@ -578,7 +523,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("3JmreiUEKn8P3SyLYmZ7C1YCd4r2nFy3Dp").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/0'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo3 = Utxo {
@@ -587,7 +532,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("3JmreiUEKn8P3SyLYmZ7C1YCd4r2nFy3Dp").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/0'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo4 = Utxo {
@@ -596,7 +541,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("3JmreiUEKn8P3SyLYmZ7C1YCd4r2nFy3Dp").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/49'/0'/0'/0/0".to_string(),
             sequence: 0,
         };
         let utxo5 = Utxo {
@@ -605,7 +550,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let utxo6 = Utxo {
@@ -614,7 +559,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let utxo7 = Utxo {
@@ -623,7 +568,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let utxo8 = Utxo {
@@ -632,7 +577,7 @@ mod tests {
             amount: 200000000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
 
@@ -677,7 +622,7 @@ mod tests {
             amount: 10000112345678,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -711,7 +656,7 @@ mod tests {
             amount: 10000112345678,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -740,7 +685,7 @@ mod tests {
             amount: 14824854,
             address: Address::from_str("mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN").unwrap(),
             script_pubkey: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/1'/0'/0/0".to_string(),
             sequence: 4294967295,
         };
         let mut utxos = Vec::new();
@@ -774,7 +719,7 @@ mod tests {
             amount: 1000,
             address: Address::from_str("37E2J9ViM4QFiewo7aw5L3drF2QKB99F9e").unwrap(),
             script_pubkey: "a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f7875987".to_string(),
-            derive_path: "0/22".to_string(),
+            derive_path: "m/49'/0'/0'/0/22".to_string(),
             sequence: 0,
         };
         let mut utxos = Vec::new();
@@ -802,7 +747,7 @@ mod tests {
             amount: 1000,
             address: Address::from_str("mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN").unwrap(),
             script_pubkey: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derive_path: "0/0".to_string(),
+            derive_path: "m/44'/1'/0'/0/0".to_string(),
             sequence: 4294967295,
         };
         let mut utxos = Vec::new();
diff --git a/imkey-core/ikc-wallet/coin-btc-fork/Cargo.toml b/imkey-core/ikc-wallet/coin-btc-fork/Cargo.toml
index c5c2f8a0..7c760da9 100644
--- a/imkey-core/ikc-wallet/coin-btc-fork/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-btc-fork/Cargo.toml
@@ -11,21 +11,20 @@ ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
 
-bitcoin = "0.29.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-bip39 = "1.0.0"
-#bitcoinconsensus = { version = "0.16", optional = true }
-failure = "0.1.8"
-hex = "0.4.3"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.89"
-bitcoin_hashes = "0.11.0"
-num-bigint = "0.4.3"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
-lazy_static = "1.4.0"
-parking_lot = "0.12.1"
-bech32 = "0.9.1"
-base64 = "0.13.1"
+bitcoin = "=0.29.2"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+tiny-bip39 = "=1.0.0"
+anyhow = "=1.0.79"
+hex = "=0.4.3"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+bitcoin_hashes = "=0.11.0"
+num-bigint = "=0.4.3"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
+lazy_static = "=1.4.0"
+parking_lot = "=0.12.1"
+bech32 = "=0.9.1"
+base64 = "=0.13.1"
 
diff --git a/imkey-core/ikc-wallet/coin-btc-fork/src/address.rs b/imkey-core/ikc-wallet/coin-btc-fork/src/address.rs
index 57fd847d..a3dd9215 100644
--- a/imkey-core/ikc-wallet/coin-btc-fork/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-btc-fork/src/address.rs
@@ -16,10 +16,9 @@ use ikc_common::error::{CoinError, CommonError};
 use ikc_common::path::check_path_validity;
 
 use bech32::{u5, ToBase32, Variant};
+use ikc_common::utility::uncompress_pubkey_2_compress;
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
-// use bitcoin::hashes::Hash;
-use ikc_common::utility::hex_to_bytes;
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct BtcForkAddress {
@@ -174,10 +173,45 @@ impl BtcForkAddress {
             addr.network.network == coin.network
         }
     }
+
+    pub fn get_pub_key(path: &str) -> Result<String> {
+        check_path_validity(path)?;
+
+        let xpub_data = get_xpub_data(path, true)?;
+        let pub_key = uncompress_pubkey_2_compress(&xpub_data[..130]);
+
+        if pub_key.starts_with("0x") {
+            Ok(pub_key)
+        } else {
+            Ok(format!("0x{}", pub_key))
+        }
+    }
+
+    pub fn from_pub_key(pub_key: Vec<u8>, btc_fork_network: BtcForkNetwork) -> Result<String> {
+        let mut public_key = PublicKey::from_slice(&pub_key)?;
+        public_key.compressed = true;
+        let address = match btc_fork_network.seg_wit.to_uppercase().as_str() {
+            "P2WPKH" => {
+                let addr = Address::p2shwpkh(&public_key, Network::Bitcoin).unwrap();
+                BtcForkAddress {
+                    payload: addr.payload,
+                    network: btc_fork_network,
+                }
+            }
+            _ => {
+                let addr = Address::p2pkh(&public_key, Network::Bitcoin);
+                BtcForkAddress {
+                    payload: addr.payload,
+                    network: btc_fork_network,
+                }
+            }
+        };
+        Ok(address.to_string())
+    }
 }
 
 impl FromStr for BtcForkAddress {
-    type Err = failure::Error;
+    type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<BtcForkAddress> {
         // try bech32
@@ -272,7 +306,7 @@ impl FromStr for BtcForkAddress {
                     Payload::ScriptHash(ScriptHash::from_slice(&data[1..]).unwrap()),
                 )
             }
-            x => {
+            _ => {
                 return Err(CoinError::InvalidVersion.into());
             }
         };
@@ -306,14 +340,13 @@ impl Display for BtcForkAddress {
                     &mut bech32_writer,
                     u5::try_from_u8(ver.to_num()).unwrap(),
                 )?;
-                bech32::ToBase32::write_base32(&prog, &mut bech32_writer)
+                ToBase32::write_base32(&prog, &mut bech32_writer)
             }
         }
     }
 }
 
 /// Extract the bech32 prefix.
-/// Returns the same slice when no prefix is found.
 fn bech32_network(bech32: &str) -> Option<BtcForkNetwork> {
     let bech32_prefix = match bech32.rfind('1') {
         None => None,
diff --git a/imkey-core/ikc-wallet/coin-btc-fork/src/btcforkapi.rs b/imkey-core/ikc-wallet/coin-btc-fork/src/btcforkapi.rs
index 9cc8a2d7..fcb17cb2 100644
--- a/imkey-core/ikc-wallet/coin-btc-fork/src/btcforkapi.rs
+++ b/imkey-core/ikc-wallet/coin-btc-fork/src/btcforkapi.rs
@@ -1,43 +1,46 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Utxo {
     #[prost(string, tag = "1")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
     #[prost(int32, tag = "2")]
     pub vout: i32,
     #[prost(int64, tag = "3")]
     pub amount: i64,
     #[prost(string, tag = "4")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub script_pub_key: std::string::String,
+    pub script_pub_key: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
-    pub derived_path: std::string::String,
+    pub derived_path: ::prost::alloc::string::String,
     #[prost(int64, tag = "7")]
     pub sequence: i64,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BtcForkTxInput {
     #[prost(string, tag = "1")]
-    pub to: std::string::String,
+    pub to: ::prost::alloc::string::String,
     #[prost(int64, tag = "2")]
     pub amount: i64,
     #[prost(message, repeated, tag = "3")]
-    pub unspents: ::std::vec::Vec<Utxo>,
+    pub unspents: ::prost::alloc::vec::Vec<Utxo>,
     #[prost(int64, tag = "4")]
     pub fee: i64,
     #[prost(uint32, tag = "5")]
     pub change_address_index: u32,
     #[prost(string, tag = "6")]
-    pub change_address: std::string::String,
+    pub change_address: ::prost::alloc::string::String,
     #[prost(string, tag = "7")]
-    pub seg_wit: std::string::String,
+    pub seg_wit: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BtcForkTxOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub wtx_hash: std::string::String,
+    pub wtx_hash: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-btc-fork/src/common.rs b/imkey-core/ikc-wallet/coin-btc-fork/src/common.rs
index 1d76e5a4..1bc283dd 100644
--- a/imkey-core/ikc-wallet/coin-btc-fork/src/common.rs
+++ b/imkey-core/ikc-wallet/coin-btc-fork/src/common.rs
@@ -6,14 +6,11 @@ use bitcoin::util::base58;
 use bitcoin::util::bip32::{ChainCode, ChildNumber, ExtendedPubKey};
 use bitcoin::Network;
 use bitcoin::{Address, PublicKey};
-use bitcoin_hashes::hex::ToHex;
-use bitcoin_hashes::sha256d::Hash as Hash256;
-use bitcoin_hashes::Hash;
 use ikc_common::apdu::{ApduCheck, BtcApdu, CoinCommonApdu};
 use ikc_common::error::CoinError;
-use ikc_common::utility::sha256_hash;
+use ikc_common::utility::{hex_to_bytes, sha256_hash};
 use ikc_transport::message::send_apdu;
-use secp256k1::{Message, PublicKey as Secp256k1PublicKey, Secp256k1, Signature};
+use secp256k1::{ecdsa::Signature, Message, PublicKey as Secp256k1PublicKey, Secp256k1};
 use std::convert::TryFrom;
 use std::str::FromStr;
 
@@ -29,30 +26,30 @@ pub fn address_verify(
 ) -> Result<Vec<String>> {
     let mut utxo_pub_key_vec: Vec<String> = vec![];
     for utxo in utxos {
-        //get utxo public key
-        let public_key_obj = Secp256k1PublicKey::from_str(public_key)?;
-
-        //gen chain code obj
-        let chain_code_obj = ChainCode::try_from(chain_code)?;
-        //build extended public key
-        let mut extend_public_key = ExtendedPubKey {
-            network: network,
-            depth: 0,
-            parent_fingerprint: Default::default(),
-            child_number: ChildNumber::from_normal_idx(0)?,
-            public_key: public_key_obj,
-            chain_code: chain_code_obj,
-        };
-
-        let bitcoin_secp = BitcoinSecp256k1::new();
-        if !utxo.derived_path.is_empty() {
-            let index_number_vec: Vec<&str> = utxo.derived_path.as_str().split('/').collect();
-            for index_number in index_number_vec {
-                let test_chain_number =
-                    ChildNumber::from_normal_idx(index_number.parse().unwrap())?;
-                extend_public_key = extend_public_key.ckd_pub(&bitcoin_secp, test_chain_number)?;
+        let extend_public_key = if !utxo.derived_path.is_empty() {
+            let xpub_data = get_xpub_data(&utxo.derived_path, false)?;
+            let public_key = &xpub_data[..130];
+            let chain_code = &xpub_data[130..194];
+            ExtendedPubKey {
+                network,
+                depth: 0,
+                parent_fingerprint: Default::default(),
+                child_number: ChildNumber::from_normal_idx(0)?,
+                public_key: Secp256k1PublicKey::from_str(public_key)?,
+                chain_code: ChainCode::from(hex_to_bytes(chain_code)?.as_slice()),
             }
-        }
+        } else {
+            let public_key_obj = Secp256k1PublicKey::from_str(public_key)?;
+            let chain_code_obj = ChainCode::try_from(chain_code)?;
+            ExtendedPubKey {
+                network,
+                depth: 0,
+                parent_fingerprint: Default::default(),
+                child_number: ChildNumber::from_normal_idx(0)?,
+                public_key: public_key_obj,
+                chain_code: chain_code_obj,
+            }
+        };
 
         let se_gen_address = match trans_type_flg {
             TransTypeFlg::BTC => Address::p2pkh(
@@ -110,13 +107,15 @@ pub fn secp256k1_sign_verify(public: &[u8], signed: &[u8], message: &[u8]) -> Re
     let mut sig_obj = Signature::from_der(signed)?;
     sig_obj.normalize_s();
     //verify
-    Ok(secp.verify(&message_obj, &sig_obj, &public_obj).is_ok())
+    Ok(secp
+        .verify_ecdsa(&message_obj, &sig_obj, &public_obj)
+        .is_ok())
 }
 
 /**
 get address version
 */
-pub fn get_address_version(network: Network, address: &str) -> Result<u8> {
+pub fn get_address_version(_network: Network, address: &str) -> Result<u8> {
     let address_bytes = base58::from(address)?;
     Ok(address_bytes.as_slice()[0])
 }
diff --git a/imkey-core/ikc-wallet/coin-btc-fork/src/lib.rs b/imkey-core/ikc-wallet/coin-btc-fork/src/lib.rs
index 776e4482..b2ef765c 100644
--- a/imkey-core/ikc-wallet/coin-btc-fork/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-btc-fork/src/lib.rs
@@ -6,16 +6,8 @@ pub mod btcforkapi;
 pub mod common;
 pub mod transaction;
 
-pub type Result<T> = result::Result<T, failure::Error>;
-extern crate failure;
+pub type Result<T> = result::Result<T, anyhow::Error>;
+extern crate anyhow;
 
 #[macro_use]
 extern crate lazy_static;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
diff --git a/imkey-core/ikc-wallet/coin-btc-fork/src/transaction.rs b/imkey-core/ikc-wallet/coin-btc-fork/src/transaction.rs
index d1c91c1e..a0e7d51e 100644
--- a/imkey-core/ikc-wallet/coin-btc-fork/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-btc-fork/src/transaction.rs
@@ -1,19 +1,13 @@
 use bitcoin::blockdata::{opcodes, script::Builder};
 use bitcoin::consensus::{serialize, Encodable};
 use bitcoin::hashes::hex::FromHex;
-use bitcoin::util::psbt::serialize::Serialize;
 use bitcoin::{
-    Address, EcdsaSighashType, LockTime, Network, OutPoint, PackedLockTime, Script, Sequence,
-    SigHashType, Transaction, TxIn, TxOut, Witness,
+    EcdsaSighashType, Network, OutPoint, PackedLockTime, Script, Sequence, Transaction, TxIn,
+    TxOut, Witness,
 };
 use bitcoin_hashes::hash160;
 use bitcoin_hashes::hex::ToHex;
-use bitcoin_hashes::sha256d::Hash as Hash256;
 use bitcoin_hashes::Hash;
-use secp256k1::Signature;
-use std::str::FromStr;
-// use serde::Serialize;
-
 use ikc_common::apdu::{ApduCheck, BtcForkApdu};
 use ikc_common::coin_info::CoinInfo;
 use ikc_common::constants::{
@@ -24,6 +18,8 @@ use ikc_common::path::check_path_validity;
 use ikc_common::utility::{bigint_to_byte_vec, hex_to_bytes, secp256k1_sign};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
+use secp256k1::ecdsa::Signature;
+use std::str::FromStr;
 
 use crate::address::BtcForkAddress;
 use crate::btc_fork_network::network_from_param;
@@ -48,7 +44,6 @@ impl BtcForkTransaction {
     ) -> Result<TxSignResult> {
         //path check
         check_path_validity(path)?;
-        let mut path_str = path.to_string();
         let bip44_segments: Vec<&str> = path.split("/").collect();
         let is_full_path = bip44_segments.len() == 6;
         let mut path_str: String = path.to_string();
@@ -200,16 +195,23 @@ impl BtcForkTransaction {
                 if y >= utxo_pub_key_vec.len() {
                     break;
                 }
+                let sign_path = if self
+                    .tx_input
+                    .unspents
+                    .get(y)
+                    .unwrap()
+                    .derived_path
+                    .is_empty()
+                {
+                    path_str.as_str()
+                } else {
+                    self.tx_input.unspents.get(y).unwrap().derived_path.as_str()
+                };
                 let btc_sign_apdu = BtcForkApdu::btc_fork_sign(
                     0x4A,
                     y as u8,
                     EcdsaSighashType::All.to_u32() as u8,
-                    format!(
-                        "{}{}",
-                        path_str,
-                        self.tx_input.unspents.get(y).unwrap().derived_path
-                    )
-                    .as_str(),
+                    sign_path,
                 );
                 //sign data
                 let btc_sign_apdu_return = send_apdu(btc_sign_apdu)?;
@@ -255,7 +257,6 @@ impl BtcForkTransaction {
     ) -> Result<TxSignResult> {
         //path check
         check_path_validity(path)?;
-        let mut path_str = path.to_string();
         let bip44_segments: Vec<&str> = path.split("/").collect();
         let is_full_path = bip44_segments.len() == 6;
         let mut path_str: String = path.to_string();
@@ -422,9 +423,13 @@ impl BtcForkTransaction {
             data.insert(0, data.len() as u8);
             //address
             let mut address_data: Vec<u8> = vec![];
-            let sign_path = format!("{}{}", path_str, unspent.derived_path);
-            address_data.push(sign_path.as_bytes().len() as u8);
-            address_data.extend_from_slice(sign_path.as_bytes());
+            if unspent.derived_path.is_empty() {
+                address_data.push(path_str.as_bytes().len() as u8);
+                address_data.extend_from_slice(path_str.as_bytes());
+            } else {
+                address_data.push(unspent.derived_path.as_bytes().len() as u8);
+                address_data.extend_from_slice(unspent.derived_path.as_bytes());
+            }
 
             data.extend(address_data.iter());
             if index == self.tx_input.unspents.len() - 1 {
@@ -582,19 +587,12 @@ impl BtcForkTransaction {
 
 #[cfg(test)]
 mod tests {
-    use bitcoin::{Address, Network};
-    use hex::FromHex;
-
-    use ikc_common::coin_info::coin_info_from_param;
-    use ikc_common::error::CoinError;
-    use ikc_device::device_binding::bind_test;
-    use ikc_device::device_binding::DeviceManage;
-    use ikc_transport::hid_api::hid_connect;
-    use std::str::FromStr;
-
     use crate::btcforkapi::BtcForkTxInput;
     use crate::btcforkapi::Utxo;
     use crate::transaction::BtcForkTransaction;
+    use bitcoin::Network;
+    use ikc_common::coin_info::coin_info_from_param;
+    use ikc_device::device_binding::bind_test;
 
     #[test]
     fn test_sign_simple_ltc() {
@@ -608,7 +606,7 @@ mod tests {
             amount: 1000000,
             address: "myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ".to_string(),
             script_pub_key: "76a914ca4d8acded69ce4f05d0925946d261f86c675fd888ac".to_string(),
-            derived_path: "0/0".to_string(),
+            derived_path: "m/44'/2'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut unspents = Vec::new();
@@ -653,7 +651,7 @@ mod tests {
             amount: 1000000,
             address: "myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ".to_string(),
             script_pub_key: "76a914ca4d8acded69ce4f05d0925946d261f86c675fd888ac".to_string(),
-            derived_path: "0/0".to_string(),
+            derived_path: "m/44'/2'/0'/0/0".to_string(),
             sequence: 0,
         };
         let mut unspents = Vec::new();
@@ -697,7 +695,7 @@ mod tests {
             amount: 19850000,
             address: "M7xo1Mi1gULZSwgvu7VVEvrwMRqngmFkVd".to_string(),
             script_pub_key: "76a914ca4d8acded69ce4f05d0925946d261f86c675fd888ac".to_string(),
-            derived_path: "0/0".to_string(),
+            derived_path: "m/44'/2'/0'/0/0".to_string(),
             sequence: 0,
         }];
         let tx_input = BtcForkTxInput {
diff --git a/imkey-core/ikc-wallet/coin-ckb/Cargo.toml b/imkey-core/ikc-wallet/coin-ckb/Cargo.toml
index 72a04456..cff7f6ad 100644
--- a/imkey-core/ikc-wallet/coin-ckb/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-ckb/Cargo.toml
@@ -10,13 +10,14 @@ edition = "2018"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-blake2b-rs = "0.2.0"
-failure = "0.1.8"
-bech32 = "0.9.1"
-hex = "0.4.3"
-byteorder = "1.4.3"
-prost = "0.11.2"
-lazy_static = "1.4.0"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-base64 = "0.13.1"
-bitcoin = "0.29.2"
\ No newline at end of file
+blake2b-rs = "=0.2.0"
+anyhow = "=1.0.79"
+bech32 = "=0.9.1"
+hex = "=0.4.3"
+byteorder = "=1.4.3"
+prost = "=0.11.2"
+lazy_static = "=1.4.0"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+base64 = "=0.13.1"
+bitcoin = "=0.29.2"
+thiserror = "=1.0.56"
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-ckb/src/address.rs b/imkey-core/ikc-wallet/coin-ckb/src/address.rs
index 47e28b0c..82701334 100644
--- a/imkey-core/ikc-wallet/coin-ckb/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-ckb/src/address.rs
@@ -2,17 +2,15 @@ use crate::hash::blake2b_160;
 use crate::Result;
 use bech32::{ToBase32, Variant};
 use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
-use bitcoin::{Network, PublicKey};
 use ikc_common::apdu::{Apdu, ApduCheck, Secp256k1Apdu};
-use ikc_common::constants;
 use ikc_common::constants::NERVOS_AID;
 use ikc_common::error::{CoinError, CommonError};
 use ikc_common::path::check_path_validity;
-use ikc_common::utility::{secp256k1_sign, secp256k1_sign_verify, uncompress_pubkey_2_compress};
+use ikc_common::utility::{network_convert, secp256k1_sign, secp256k1_sign_verify};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::send_apdu;
-use secp256k1::PublicKey as Secp256k1PublicKey;
-use std::convert::TryFrom;
+use secp256k1::hashes::hex::FromHex;
+use secp256k1::{PublicKey as Secp256k1PublicKey, PublicKey};
 use std::str::FromStr;
 
 pub struct CkbAddress {}
@@ -23,8 +21,7 @@ impl CkbAddress {
             "TESTNET" => "ckt",
             _ => "ckb",
         };
-
-        let pub_key_hash = blake2b_160(pubkey);
+        let pub_key_hash = blake2b_160(PublicKey::from_slice(pubkey)?.serialize());
 
         let mut buf = vec![];
         buf.extend(vec![0x1, 0x00]); // append short version for locks with popular codehash and default code hash index
@@ -34,7 +31,7 @@ impl CkbAddress {
     }
 
     pub fn get_public_key(path: &str) -> Result<String> {
-        check_path_validity(path).expect("check path error");
+        check_path_validity(path)?;
 
         let select_apdu = Apdu::select_applet(NERVOS_AID);
         let select_response = send_apdu(select_apdu)?;
@@ -75,9 +72,7 @@ impl CkbAddress {
 
     pub fn get_address(network: &str, path: &str) -> Result<String> {
         let pub_key = CkbAddress::get_public_key(path)?;
-        let comprs_pubkey = uncompress_pubkey_2_compress(&pub_key);
-        let comprs_pubkey_bytes = hex::decode(&comprs_pubkey).expect("decode ckb pubkey error");
-        let address = CkbAddress::from_public_key(network, &comprs_pubkey_bytes)?;
+        let address = CkbAddress::from_public_key(network, &Vec::from_hex(&pub_key)?)?;
         Ok(address)
     }
 
@@ -90,7 +85,7 @@ impl CkbAddress {
         Ok(address)
     }
 
-    pub fn get_enc_xpub(network: Network, path: &str) -> Result<String> {
+    pub fn get_enc_xpub(network: &str, path: &str) -> Result<String> {
         let xpub = Self::get_xpub(network, path)?;
         let key = ikc_common::XPUB_COMMON_KEY_128.read();
         let iv = ikc_common::XPUB_COMMON_IV.read();
@@ -101,7 +96,7 @@ impl CkbAddress {
         Ok(base64::encode(&encrypted))
     }
 
-    pub fn get_xpub(network: Network, path: &str) -> Result<String> {
+    pub fn get_xpub(network: &str, path: &str) -> Result<String> {
         //path check
         check_path_validity(path)?;
 
@@ -123,9 +118,10 @@ impl CkbAddress {
 
         //get parent public key fingerprint
         let parent_chain_code = ChainCode::from(hex::decode(parent_chain_code)?.as_slice());
+        let network = network_convert(network);
         let parent_ext_pub_key = ExtendedPubKey {
-            network: network,
-            depth: 0 as u8,
+            network,
+            depth: 0u8,
             parent_fingerprint: Fingerprint::default(),
             child_number: ChildNumber::from_normal_idx(0).unwrap(),
             public_key: parent_pub_key_obj,
@@ -187,7 +183,6 @@ impl CkbAddress {
 #[cfg(test)]
 mod tests {
     use crate::address::CkbAddress;
-    use bitcoin::Network;
     use ikc_common::constants;
     use ikc_common::{XPUB_COMMON_IV, XPUB_COMMON_KEY_128};
     use ikc_device::device_binding::bind_test;
@@ -217,7 +212,7 @@ mod tests {
     fn test_get_public_key() {
         bind_test();
 
-        let network = "TESTNET";
+        let _network = "TESTNET";
         let pk = CkbAddress::get_public_key(constants::NERVOS_PATH).expect("get pubkey fail");
         assert_eq!(&pk, "04554851980004FF256888612BF0D64D9B1002BF82331450FD5A7405D1B23CC5BD2F4DDA9D71F6502CD761AFB29B1A89AECEBC832851CD361D3351216F08635BBF");
     }
@@ -249,17 +244,15 @@ mod tests {
         *XPUB_COMMON_KEY_128.write() = "4A2B655485ABBAB54BD30298BB0A5B55".to_string();
         *XPUB_COMMON_IV.write() = "73518399CB98DCD114D873E06EBF4BCC".to_string();
 
-        let version: Network = Network::Bitcoin;
         let path: &str = "m/44'/309'/0'";
-        let get_xpub_result = CkbAddress::get_xpub(version, path);
+        let get_xpub_result = CkbAddress::get_xpub("MAINNET", path);
         assert!(get_xpub_result.is_ok());
         let xpub = get_xpub_result.ok().unwrap();
-        assert_eq!("xpub6CuQc3kkPk2oPKAXnCpEJNkmwzMkXmv1BBG5a2aUbhGBR49zqmSUpJDG3veFgfiMDcjusGVoHP574ecgsyo48Hvmgq33oP8NRoC9kHqZYuN", xpub);
+        assert_eq!("xpub6CyvXfYwHJjJ9syYjG7qZMva1yMx93SUmqUcKHvoReUadCzqJA8mMXrrXQjRvzveuahgdQmCsdsuiCkMRsLec63DW83Wwu5UqKJQmsonKpo", xpub);
 
-        let version: Network = Network::Bitcoin;
         let path: &str = "m/44'/309'/0'";
-        let get_enc_xpub_result = CkbAddress::get_enc_xpub(version, path);
+        let get_enc_xpub_result = CkbAddress::get_enc_xpub("MAINNET", path);
         let enc_xpub = get_enc_xpub_result.ok().unwrap();
-        assert_eq!("iWHbNJrWJIb0Kj8GRWzQX9Z1wUNP4HQecGNaAI+KUqsMFCKaP1rDz0KCwlSVvwcONB3S80hdbZOoW56VGB1hcqPyS45qxPcqi+xTtDNYasP2mmnNd4rO1HEJIQOaejDEdGEg2psFu/dzrRHKoZ6gRQ==", enc_xpub);
+        assert_eq!("xkpmspgDJhDx7nBk/se+P0CRS/fbPKYivQiqocPEdXFIsNLCHy5lZEc59LGLbsFFamWX7j8TUs5ugKynEign+y0hDQIhm3y1PypmU+frhoWckc7vgkdzbd9xGdMTVv7J+JW4Zlenksb8a9UNkRfrJg==", enc_xpub);
     }
 }
diff --git a/imkey-core/ikc-wallet/coin-ckb/src/lib.rs b/imkey-core/ikc-wallet/coin-ckb/src/lib.rs
index c475fa0c..965b44ad 100644
--- a/imkey-core/ikc-wallet/coin-ckb/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-ckb/src/lib.rs
@@ -4,46 +4,46 @@ pub mod nervosapi;
 pub mod serializer;
 pub mod signer;
 pub mod transaction_helper;
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-use failure::Fail;
+pub type Result<T> = result::Result<T, anyhow::Error>;
 pub use nervosapi::{CachedCell, CellInput, CkbTxInput, CkbTxOutput, OutPoint, Script, Witness};
 pub use serializer::Serializer;
+use thiserror::Error;
 
-#[derive(Fail, Debug, PartialEq)]
+#[derive(Error, Debug, PartialEq)]
 pub enum Error {
-    #[fail(display = "invalid_output_point")]
+    #[error("invalid_output_point")]
     InvalidOutputPoint,
 
-    #[fail(display = "invalid_outputs_data_length")]
+    #[error("invalid_outputs_data_length")]
     InvalidOutputsDataLength,
 
-    #[fail(display = "required_witness")]
+    #[error("required_witness")]
     RequiredWitness,
 
-    #[fail(display = "invalid_input_cells")]
+    #[error("invalid_input_cells")]
     InvalidInputCells,
 
-    #[fail(display = "required_output_data")]
+    #[error("required_output_data")]
     RequiredOutputsData,
 
-    #[fail(display = "witness_group_empty")]
+    #[error("witness_group_empty")]
     WitnessGroupEmpty,
 
-    #[fail(display = "witness_empty")]
+    #[error("witness_empty")]
     WitnessEmpty,
 
-    #[fail(display = "invalid_tx_hash")]
+    #[error("invalid_tx_hash")]
     InvalidTxHash,
 
-    #[fail(display = "invalid_hash_type")]
+    #[error("invalid_hash_type")]
     InvalidHashType,
 
-    #[fail(display = "cell_input_not_cached")]
+    #[error("cell_input_not_cached")]
     CellInputNotCached,
 
-    #[fail(display = "invalid_hex_value")]
+    #[error("invalid_hex_value")]
     InvalidHexValue,
 }
 
diff --git a/imkey-core/ikc-wallet/coin-ckb/src/nervosapi.rs b/imkey-core/ikc-wallet/coin-ckb/src/nervosapi.rs
index c8e204bb..56044ed1 100644
--- a/imkey-core/ikc-wallet/coin-ckb/src/nervosapi.rs
+++ b/imkey-core/ikc-wallet/coin-ckb/src/nervosapi.rs
@@ -1,61 +1,68 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OutPoint {
     #[prost(string, tag = "1")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
     #[prost(int32, tag = "2")]
     pub index: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Witness {
     #[prost(string, tag = "1")]
-    pub lock: std::string::String,
+    pub lock: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub input_type: std::string::String,
+    pub input_type: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub output_type: std::string::String,
+    pub output_type: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Script {
     #[prost(string, tag = "1")]
-    pub args: std::string::String,
+    pub args: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub code_hash: std::string::String,
+    pub code_hash: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub hash_type: std::string::String,
+    pub hash_type: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CellInput {
     #[prost(message, optional, tag = "1")]
-    pub previous_output: ::std::option::Option<OutPoint>,
+    pub previous_output: ::core::option::Option<OutPoint>,
     #[prost(string, tag = "2")]
-    pub since: std::string::String,
+    pub since: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CachedCell {
     #[prost(int64, tag = "1")]
     pub capacity: i64,
     #[prost(message, optional, tag = "2")]
-    pub lock: ::std::option::Option<Script>,
+    pub lock: ::core::option::Option<Script>,
     #[prost(message, optional, tag = "3")]
-    pub out_point: ::std::option::Option<OutPoint>,
+    pub out_point: ::core::option::Option<OutPoint>,
     #[prost(string, tag = "4")]
-    pub derived_path: std::string::String,
+    pub derived_path: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CkbTxInput {
     #[prost(message, repeated, tag = "1")]
-    pub inputs: ::std::vec::Vec<CellInput>,
+    pub inputs: ::prost::alloc::vec::Vec<CellInput>,
     #[prost(message, repeated, tag = "2")]
-    pub witnesses: ::std::vec::Vec<Witness>,
+    pub witnesses: ::prost::alloc::vec::Vec<Witness>,
     #[prost(message, repeated, tag = "3")]
-    pub cached_cells: ::std::vec::Vec<CachedCell>,
+    pub cached_cells: ::prost::alloc::vec::Vec<CachedCell>,
     #[prost(string, tag = "4")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CkbTxOutput {
     #[prost(string, tag = "1")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
     #[prost(string, repeated, tag = "2")]
-    pub witnesses: ::std::vec::Vec<std::string::String>,
+    pub witnesses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
diff --git a/imkey-core/ikc-wallet/coin-ckb/src/signer.rs b/imkey-core/ikc-wallet/coin-ckb/src/signer.rs
index 961ffb53..525613ee 100644
--- a/imkey-core/ikc-wallet/coin-ckb/src/signer.rs
+++ b/imkey-core/ikc-wallet/coin-ckb/src/signer.rs
@@ -14,7 +14,7 @@ use ikc_common::{constants, utility, SignParam};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
 use lazy_static::lazy_static;
-use secp256k1::Signature;
+use secp256k1::ecdsa::Signature;
 
 pub struct CkbSigner {}
 
@@ -70,7 +70,7 @@ impl<'a> CkbTxSigner<'a> {
         &mut self,
         tx_hash: &[u8],
         witness_group: &[&Witness],
-        path: &str,
+        _path: &str,
     ) -> Result<Witness> {
         if witness_group.len() == 0 {
             return Err(Error::WitnessGroupEmpty.into());
@@ -269,8 +269,7 @@ impl CkbSigner {
 
 #[cfg(test)]
 mod tests {
-    use crate::address::CkbAddress;
-    use crate::nervosapi::{CachedCell, CkbTxInput, CkbTxOutput, OutPoint, Witness};
+    use crate::nervosapi::{CachedCell, CkbTxInput, OutPoint, Witness};
     use crate::signer::CkbSigner;
     use crate::{CellInput, Script};
     use ikc_common::{constants, SignParam};
diff --git a/imkey-core/ikc-wallet/coin-cosmos/Cargo.toml b/imkey-core/ikc-wallet/coin-cosmos/Cargo.toml
index e3e374e6..6f4c60ea 100644
--- a/imkey-core/ikc-wallet/coin-cosmos/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-cosmos/Cargo.toml
@@ -10,21 +10,20 @@ edition = "2018"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-bitcoin_hashes = "0.11.0"
-hex = "0.4.3"
-bitcoin = "0.29.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-ring = "0.16.20"
-bech32 = "0.9.1"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_derive = "1.0.110"
-serde_json = { version = "1.0.89", default-features = false, features = ["alloc"] }
-num-bigint = "0.4.3"
-num-traits = "0.2.11"
-num-integer = "0.1.42"
-base64 = "0.13.1"
-failure = "0.1.8"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
-linked-hash-map = { version = "0.5", features = ["serde_impl"] }
\ No newline at end of file
+bitcoin_hashes = "=0.11.0"
+hex = "=0.4.3"
+bitcoin = "=0.29.2"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+bech32 = "=0.9.1"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_derive = "=1.0.147"
+serde_json = { version = "=1.0.89", default-features = false, features = ["alloc"] }
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+num-integer = "=0.1.45"
+base64 = "=0.13.1"
+anyhow = "=1.0.79"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
+linked-hash-map = { version = "=0.5.6", features = ["serde_impl"] }
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-cosmos/src/address.rs b/imkey-core/ikc-wallet/coin-cosmos/src/address.rs
index 533eebce..a21bfd77 100644
--- a/imkey-core/ikc-wallet/coin-cosmos/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-cosmos/src/address.rs
@@ -1,16 +1,19 @@
 use crate::Result;
-// use bech32::bech32::Bech32;
 use bech32::{encode, ToBase32, Variant};
-use bitcoin::bech32::convert_bits;
+use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
+use bitcoin::Network;
 use bitcoin_hashes::hex::{FromHex, ToHex};
 use bitcoin_hashes::{hash160, Hash};
 use hex;
 use ikc_common::apdu::{ApduCheck, CoinCommonApdu, CosmosApdu};
 use ikc_common::error::CoinError;
 use ikc_common::path;
+use ikc_common::path::{check_path_validity, get_parent_path};
 use ikc_common::utility;
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message;
+use secp256k1::PublicKey;
+use std::str::FromStr;
 
 #[derive(Debug)]
 pub struct CosmosAddress {}
@@ -42,19 +45,14 @@ impl CosmosAddress {
             return Err(CoinError::ImkeySignatureVerifyFail.into());
         }
 
-        let uncomprs_pubkey: String = res_msg_pubkey
-            .chars()
-            .take(res_msg_pubkey.len() - 4)
-            .collect();
-        let comprs_pubkey = utility::uncompress_pubkey_2_compress(&uncomprs_pubkey);
-
-        Ok(comprs_pubkey)
+        Ok(sign_source_val.to_string())
     }
 
     pub fn get_address(path: &str) -> Result<String> {
-        let comprs_pubkey = CosmosAddress::get_pub_key(path).unwrap();
+        let compress_pubkey =
+            utility::uncompress_pubkey_2_compress(&CosmosAddress::get_pub_key(path)?);
         //hash160
-        let pub_key_bytes = hex::decode(comprs_pubkey).unwrap();
+        let pub_key_bytes = hex::decode(compress_pubkey).unwrap();
         let pub_key_hash = hash160::Hash::hash(&pub_key_bytes).to_hex();
         let hh = Vec::from_hex(&pub_key_hash).unwrap();
         let address = encode("cosmos", hh.to_base32(), Variant::Bech32)?;
@@ -68,6 +66,62 @@ impl CosmosAddress {
         ApduCheck::check_response(&res_reg)?;
         Ok(address)
     }
+
+    pub fn get_xpub(path: &str) -> Result<String> {
+        //path check
+        check_path_validity(path)?;
+
+        //get xpub data
+        let xpub_data = Self::get_pub_key(path)?;
+        let xpub_data = &xpub_data[..194];
+
+        //get public key and chain code
+        let pub_key = &xpub_data[..130];
+        let sub_chain_code = &xpub_data[130..];
+        let pub_key_obj = PublicKey::from_str(pub_key)?;
+
+        //build parent public key obj
+        let parent_xpub_data = Self::get_pub_key(get_parent_path(path)?)?;
+        let parent_xpub_data = &parent_xpub_data[..194];
+        let parent_pub_key = &parent_xpub_data[..130];
+        let parent_chain_code = &parent_xpub_data[130..];
+        let parent_pub_key_obj = PublicKey::from_str(parent_pub_key)?;
+
+        //get parent public key fingerprint
+        let parent_chain_code = ChainCode::from(hex::decode(parent_chain_code)?.as_slice());
+        let parent_ext_pub_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: 0 as u8,
+            parent_fingerprint: Fingerprint::default(),
+            child_number: ChildNumber::from_normal_idx(0).unwrap(),
+            public_key: parent_pub_key_obj,
+            chain_code: parent_chain_code,
+        };
+        let fingerprint_obj = parent_ext_pub_key.fingerprint();
+
+        //build extend public key obj
+        let sub_chain_code_obj = ChainCode::from(hex::decode(sub_chain_code)?.as_slice());
+
+        let chain_number_vec: Vec<ChildNumber> = DerivationPath::from_str(path)?.into();
+        let extend_public_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: chain_number_vec.len() as u8,
+            parent_fingerprint: fingerprint_obj,
+            child_number: *chain_number_vec.get(chain_number_vec.len() - 1).unwrap(),
+            public_key: pub_key_obj,
+            chain_code: sub_chain_code_obj,
+        };
+        //get and return xpub
+        Ok(extend_public_key.to_string())
+    }
+
+    pub fn from_pub_key(pub_key: Vec<u8>) -> Result<String> {
+        let public_key = PublicKey::from_slice(pub_key.as_slice())?;
+        let compressed_pubkey = public_key.serialize();
+        let pub_key_hash = hash160::Hash::hash(&compressed_pubkey).to_vec();
+        let address = encode("cosmos", pub_key_hash.to_base32(), Variant::Bech32)?;
+        Ok(address)
+    }
 }
 
 #[cfg(test)]
@@ -84,7 +138,7 @@ mod tests {
         let comprs_pubkey = CosmosAddress::get_pub_key(constants::COSMOS_PATH).unwrap();
         assert_eq!(
             &comprs_pubkey,
-            "0232C1EF21D73C19531B0AA4E863CF397C2B982B2F958F60CDB62969824C096D65"
+            "0432C1EF21D73C19531B0AA4E863CF397C2B982B2F958F60CDB62969824C096D658AEDE012F4A4B2E3A893B71A787617FEB04F19D2E3BAC5CEE989AA55E8057458CCAAB803B2556DC264D2EE7836AC20B3E2FADB725DA9167F87BD10013D9E48F3"
         );
     }
 
diff --git a/imkey-core/ikc-wallet/coin-cosmos/src/cosmosapi.rs b/imkey-core/ikc-wallet/coin-cosmos/src/cosmosapi.rs
index 813662e7..bb088145 100644
--- a/imkey-core/ikc-wallet/coin-cosmos/src/cosmosapi.rs
+++ b/imkey-core/ikc-wallet/coin-cosmos/src/cosmosapi.rs
@@ -1,10 +1,12 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CosmosTxInput {
     #[prost(string, tag = "1")]
-    pub data: std::string::String,
+    pub data: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CosmosTxOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-cosmos/src/lib.rs b/imkey-core/ikc-wallet/coin-cosmos/src/lib.rs
index cbb16326..76c13e3e 100644
--- a/imkey-core/ikc-wallet/coin-cosmos/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-cosmos/src/lib.rs
@@ -1,19 +1,6 @@
 pub mod address;
 pub mod cosmosapi;
 pub mod transaction;
-
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-// #[macro_use]
-// extern crate serde_json;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-cosmos/src/transaction.rs b/imkey-core/ikc-wallet/coin-cosmos/src/transaction.rs
index 285dcec8..7f49af0e 100644
--- a/imkey-core/ikc-wallet/coin-cosmos/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-cosmos/src/transaction.rs
@@ -1,4 +1,3 @@
-use crate::address::CosmosAddress;
 use crate::cosmosapi::CosmosTxOutput;
 use crate::Result;
 use bitcoin_hashes::hex::ToHex;
@@ -7,9 +6,8 @@ use ikc_common::constants;
 use ikc_common::utility::{hex_to_bytes, secp256k1_sign, sha256_hash};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
-use secp256k1::{self, Signature as SecpSignature};
-use serde::{Deserialize, Serialize};
-use serde_json::{Map, Value};
+use secp256k1::{self, ecdsa::Signature as SecpSignature};
+use ikc_common::path::check_path_validity;
 
 #[derive(Debug)]
 pub struct CosmosTransaction {
@@ -22,6 +20,7 @@ pub struct CosmosTransaction {
 
 impl CosmosTransaction {
     pub fn sign(self) -> Result<CosmosTxOutput> {
+        check_path_validity(&self.path).unwrap();
         let sign_hash = sha256_hash(hex_to_bytes(&self.sign_data)?.as_slice());
         let mut sign_pack = "0120".to_string();
         sign_pack.push_str(&sign_hash.to_hex());
@@ -59,7 +58,7 @@ impl CosmosTransaction {
             ApduCheck::check_response(&response)?;
         }
 
-        let sign_apdu = CosmosApdu::sign_digest(constants::COSMOS_PATH);
+        let sign_apdu = CosmosApdu::sign_digest(&self.path);
 
         let sign_result = send_apdu(sign_apdu)?;
         ApduCheck::check_response(&sign_result)?;
@@ -77,12 +76,10 @@ impl CosmosTransaction {
 
 #[cfg(test)]
 mod tests {
-    // use crate::transaction::{Coin, CosmosTransaction, SignData, StdFee};
     use crate::transaction::CosmosTransaction;
     use ikc_common::constants;
     use ikc_common::utility::{hex_to_bytes, secp256k1_sign};
     use ikc_device::device_binding::bind_test;
-    use serde_json::json;
 
     #[test]
     fn test_ecsign() {
diff --git a/imkey-core/ikc-wallet/coin-eos/Cargo.toml b/imkey-core/ikc-wallet/coin-eos/Cargo.toml
index 980486b0..37ee8f25 100644
--- a/imkey-core/ikc-wallet/coin-eos/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-eos/Cargo.toml
@@ -10,10 +10,10 @@ edition = "2018"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-bitcoin_hashes = "0.11.0"
-hex = "0.4.3"
-bitcoin = "0.29.2"
-failure = "0.1.8"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
\ No newline at end of file
+bitcoin_hashes = "=0.11.0"
+hex = "=0.4.3"
+bitcoin = "=0.29.2"
+anyhow = "=1.0.79"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-eos/src/eosapi.rs b/imkey-core/ikc-wallet/coin-eos/src/eosapi.rs
index 6ae5277d..6e5b0296 100644
--- a/imkey-core/ikc-wallet/coin-eos/src/eosapi.rs
+++ b/imkey-core/ikc-wallet/coin-eos/src/eosapi.rs
@@ -1,46 +1,52 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosTxInput {
     #[prost(message, repeated, tag = "1")]
-    pub transactions: ::std::vec::Vec<EosSignData>,
+    pub transactions: ::prost::alloc::vec::Vec<EosSignData>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosSignData {
     #[prost(string, tag = "1")]
-    pub tx_hex: std::string::String,
+    pub tx_hex: ::prost::alloc::string::String,
     #[prost(string, repeated, tag = "2")]
-    pub public_keys: ::std::vec::Vec<std::string::String>,
+    pub public_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(string, tag = "3")]
-    pub chain_id: std::string::String,
+    pub chain_id: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub receiver: std::string::String,
+    pub receiver: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub payment: std::string::String,
+    pub payment: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
-    pub sender: std::string::String,
+    pub sender: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosTxOutput {
     #[prost(message, repeated, tag = "1")]
-    pub trans_multi_signs: ::std::vec::Vec<EosSignResult>,
+    pub trans_multi_signs: ::prost::alloc::vec::Vec<EosSignResult>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosSignResult {
     #[prost(string, tag = "1")]
-    pub hash: std::string::String,
+    pub hash: ::prost::alloc::string::String,
     #[prost(string, repeated, tag = "2")]
-    pub signs: ::std::vec::Vec<std::string::String>,
+    pub signs: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosMessageInput {
     #[prost(string, tag = "1")]
-    pub data: std::string::String,
+    pub data: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub pubkey: std::string::String,
+    pub pubkey: ::prost::alloc::string::String,
     #[prost(bool, tag = "3")]
     pub is_hex: bool,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosMessageOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-eos/src/lib.rs b/imkey-core/ikc-wallet/coin-eos/src/lib.rs
index 173d2e9b..d39ebebd 100644
--- a/imkey-core/ikc-wallet/coin-eos/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-eos/src/lib.rs
@@ -1,15 +1,6 @@
 pub mod eosapi;
 pub mod pubkey;
 pub mod transaction;
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-eos/src/pubkey.rs b/imkey-core/ikc-wallet/coin-eos/src/pubkey.rs
index 6e745686..dc7eb206 100644
--- a/imkey-core/ikc-wallet/coin-eos/src/pubkey.rs
+++ b/imkey-core/ikc-wallet/coin-eos/src/pubkey.rs
@@ -1,10 +1,16 @@
 use crate::Result;
+use anyhow::anyhow;
+use bitcoin::secp256k1::PublicKey;
 use bitcoin::util::base58;
+use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
+use bitcoin::Network;
 use bitcoin_hashes::{ripemd160, Hash};
 use ikc_common::apdu::{ApduCheck, CoinCommonApdu, EosApdu};
+use ikc_common::path::{check_path_validity, get_parent_path};
 use ikc_common::{path, utility};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message;
+use std::str::FromStr;
 
 #[derive(Debug)]
 pub struct EosPubkey {}
@@ -34,7 +40,7 @@ impl EosPubkey {
             hex::decode(sign_source_val).unwrap().as_slice(),
         )?;
         if !sign_verify_result {
-            return Err(format_err!("imkey_signature_verify_fail"));
+            return Err(anyhow!("imkey_signature_verify_fail"));
         }
 
         //compressed key
@@ -54,6 +60,83 @@ impl EosPubkey {
         Ok(eos_pk)
     }
 
+    pub fn get_sub_pubkey(path: &str) -> Result<String> {
+        path::check_path_validity(path)?;
+
+        let select_apdu = EosApdu::select_applet();
+        let select_response = message::send_apdu(select_apdu)?;
+        ApduCheck::check_response(&select_response)?;
+
+        //get public key
+        let msg_pubkey = EosApdu::get_xpub(&path, true);
+        let res_msg_pubkey = message::send_apdu(msg_pubkey)?;
+        ApduCheck::check_response(&res_msg_pubkey)?;
+
+        let sign_source_val = &res_msg_pubkey[..194];
+        let sign_result = &res_msg_pubkey[194..res_msg_pubkey.len() - 4];
+
+        let key_manager_obj = KEY_MANAGER.lock();
+
+        //use se public key verify sign
+        let sign_verify_result = utility::secp256k1_sign_verify(
+            &key_manager_obj.se_pub_key,
+            hex::decode(sign_result).unwrap().as_slice(),
+            hex::decode(sign_source_val).unwrap().as_slice(),
+        )?;
+        if !sign_verify_result {
+            return Err(anyhow!("imkey_signature_verify_fail"));
+        }
+
+        Ok(sign_source_val.to_string())
+    }
+
+    pub fn get_xpub(path: &str) -> Result<String> {
+        //path check
+        check_path_validity(path)?;
+
+        //get xpub data
+        let xpub_data = Self::get_sub_pubkey(path)?;
+
+        //get public key and chain code
+        let pub_key = &xpub_data[..130];
+        let sub_chain_code = &xpub_data[130..];
+        let pub_key_obj = PublicKey::from_str(pub_key)?;
+
+        //build parent public key obj
+        let parent_xpub_data = Self::get_sub_pubkey(get_parent_path(path)?)?;
+        let parent_xpub_data = &parent_xpub_data[..194];
+        let parent_pub_key = &parent_xpub_data[..130];
+        let parent_chain_code = &parent_xpub_data[130..];
+        let parent_pub_key_obj = PublicKey::from_str(parent_pub_key)?;
+
+        //get parent public key fingerprint
+        let parent_chain_code = ChainCode::from(hex::decode(parent_chain_code)?.as_slice());
+        let parent_ext_pub_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: 0 as u8,
+            parent_fingerprint: Fingerprint::default(),
+            child_number: ChildNumber::from_normal_idx(0).unwrap(),
+            public_key: parent_pub_key_obj,
+            chain_code: parent_chain_code,
+        };
+        let fingerprint_obj = parent_ext_pub_key.fingerprint();
+
+        //build extend public key obj
+        let sub_chain_code_obj = ChainCode::from(hex::decode(sub_chain_code)?.as_slice());
+
+        let chain_number_vec: Vec<ChildNumber> = DerivationPath::from_str(path)?.into();
+        let extend_public_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: chain_number_vec.len() as u8,
+            parent_fingerprint: fingerprint_obj,
+            child_number: *chain_number_vec.get(chain_number_vec.len() - 1).unwrap(),
+            public_key: pub_key_obj,
+            chain_code: sub_chain_code_obj,
+        };
+        //get and return xpub
+        Ok(extend_public_key.to_string())
+    }
+
     pub fn pubkey_from_response(response: &str) -> Result<String> {
         //compressed key
         let uncomprs_pubkey: String = response.chars().take(response.len() - 4).collect();
@@ -75,6 +158,16 @@ impl EosPubkey {
         ApduCheck::check_response(&res_reg)?;
         Ok(pubkey)
     }
+
+    pub fn from_pub_key(pub_key: &[u8]) -> Result<String> {
+        let mut compressed_pub_key = PublicKey::from_slice(pub_key)?.serialize().to_vec();
+        //checksum base58
+        let pub_key_hash = ripemd160::Hash::hash(&compressed_pub_key);
+        let check_sum = &pub_key_hash[0..4];
+        compressed_pub_key.extend(check_sum);
+        let eos_pk = "EOS".to_owned() + base58::encode_slice(&compressed_pub_key).as_ref();
+        Ok(eos_pk)
+    }
 }
 
 #[cfg(test)]
diff --git a/imkey-core/ikc-wallet/coin-eos/src/transaction.rs b/imkey-core/ikc-wallet/coin-eos/src/transaction.rs
index 5a1f0a1d..e23323c2 100644
--- a/imkey-core/ikc-wallet/coin-eos/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-eos/src/transaction.rs
@@ -1,7 +1,8 @@
 use crate::eosapi::{EosMessageInput, EosMessageOutput, EosSignResult, EosTxInput, EosTxOutput};
 use crate::pubkey::EosPubkey;
 use crate::Result;
-use bitcoin::secp256k1::Signature;
+use anyhow::anyhow;
+use bitcoin::secp256k1::ecdsa::Signature;
 use bitcoin::util::base58;
 use bitcoin_hashes::hex::ToHex;
 use bitcoin_hashes::{ripemd160, Hash};
@@ -97,7 +98,7 @@ impl EosTransaction {
                 comprs_pubkey_slice.extend(check_sum);
                 let eos_pk = "EOS".to_owned() + base58::encode_slice(&comprs_pubkey_slice).as_ref();
                 if pub_key != &eos_pk {
-                    return Err(format_err!("imkey_publickey_mismatch_with_path"));
+                    return Err(anyhow!("imkey_publickey_mismatch_with_path"));
                 }
 
                 //sign
@@ -197,7 +198,7 @@ impl EosTransaction {
         let pubkey = EosPubkey::pubkey_from_response(&prepare_response).unwrap();
         let mut signature = "".to_string();
         if &pubkey != &input.pubkey {
-            return Err(format_err!("imkey_publickey_mismatch_with_path"));
+            return Err(anyhow!("imkey_publickey_mismatch_with_path"));
         }
         //sign
         let mut nonce = 0;
diff --git a/imkey-core/ikc-wallet/coin-ethereum/Cargo.toml b/imkey-core/ikc-wallet/coin-ethereum/Cargo.toml
index e8046f9c..185c24c1 100644
--- a/imkey-core/ikc-wallet/coin-ethereum/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-ethereum/Cargo.toml
@@ -10,26 +10,26 @@ edition = "2018"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-rlp = "0.5.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-ethereum-types = "0.14.0"
-keccak-hash = "0.10.0"
-lazy_static = "1.4.0"
-rustc-hex = "2.1.0"
-serde_json = "1.0.89"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_derive = "1.0.147"
-jsonrpc-core = "18.0.0"
-dotenv = "0.9.0"
-bitcoin = "0.29.2"
-bitcoin_hashes = "0.11.0"
-hex = "0.4.3"
-regex = "1.7.0"
-tiny-keccak = { version = "2.0.2", features = ["keccak"] }
-failure = "0.1.8"
-num-bigint = "0.4.3"
-num-traits = "0.2.11"
-num-integer = "0.1.42"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
\ No newline at end of file
+rlp = "=0.5.2"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+ethereum-types = "=0.14.0"
+keccak-hash = "=0.10.0"
+lazy_static = "=1.4.0"
+rustc-hex = "=2.1.0"
+serde_json = "=1.0.89"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_derive = "=1.0.147"
+jsonrpc-core = "=18.0.0"
+bitcoin = "=0.29.2"
+bitcoin_hashes = "=0.11.0"
+hex = "=0.4.3"
+regex = "=1.9.3"
+tiny-keccak = { version = "=2.0.2", features = ["keccak"] }
+anyhow = "=1.0.79"
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+num-integer = "=0.1.45"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
+base64 = "=0.13.1"
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-ethereum/src/address.rs b/imkey-core/ikc-wallet/coin-ethereum/src/address.rs
index 37c49ead..2adc6eb6 100644
--- a/imkey-core/ikc-wallet/coin-ethereum/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-ethereum/src/address.rs
@@ -1,23 +1,28 @@
 use crate::Result;
+use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
+use bitcoin::Network;
 use hex;
 use ikc_common::apdu::{ApduCheck, CoinCommonApdu, EthApdu};
-use ikc_common::path::check_path_validity;
+use ikc_common::path::{check_path_validity, get_parent_path};
 use ikc_common::utility::hex_to_bytes;
 use ikc_transport::message::send_apdu;
 use keccak_hash::keccak;
 use regex::Regex;
+use secp256k1::PublicKey;
+use std::str::FromStr;
 
 #[derive(Debug)]
 pub struct EthAddress {}
 
 impl EthAddress {
-    pub fn address_from_pubkey(pubkey: Vec<u8>) -> Result<String> {
-        let pubkey_hash = keccak(pubkey[1..].as_ref());
-        let addr_bytes = &pubkey_hash[12..];
-        Ok(hex::encode(addr_bytes))
+    pub fn from_pub_key(pub_key: Vec<u8>) -> Result<String> {
+        let pub_key_hash = keccak(pub_key[1..].as_ref());
+        let addr_bytes = &pub_key_hash[12..];
+        let address = EthAddress::address_checksum(&hex::encode(addr_bytes));
+        Ok(address)
     }
 
-    pub fn address_checksummed(address: &str) -> String {
+    pub fn address_checksum(address: &str) -> String {
         let re = Regex::new(r"^0x").expect("address_checksummed");
         let address = address.to_lowercase();
         let address = re.replace_all(&address, "").to_string();
@@ -56,8 +61,7 @@ impl EthAddress {
 
         let pubkey_raw = hex_to_bytes(&res_msg_pubkey[..130]).unwrap();
 
-        let address_main = EthAddress::address_from_pubkey(pubkey_raw.clone())?;
-        let address_checksum = EthAddress::address_checksummed(&address_main);
+        let address_checksum = EthAddress::from_pub_key(pubkey_raw.clone())?;
         Ok(address_checksum)
     }
 
@@ -68,6 +72,69 @@ impl EthAddress {
         ApduCheck::check_response(&res_reg)?;
         Ok(address)
     }
+
+    pub fn get_pub_key(path: &str) -> Result<String> {
+        check_path_validity(path)?;
+
+        let select_apdu = EthApdu::select_applet();
+        let select_response = send_apdu(select_apdu)?;
+        ApduCheck::check_response(&select_response)?;
+
+        //get public
+        let msg_pubkey = EthApdu::get_xpub(&path, false);
+        let res_msg_pubkey = send_apdu(msg_pubkey)?;
+        ApduCheck::check_response(&res_msg_pubkey)?;
+
+        Ok(res_msg_pubkey[..194].to_string())
+    }
+
+    pub fn get_xpub(path: &str) -> Result<String> {
+        //path check
+        check_path_validity(path)?;
+
+        //get xpub data
+        let xpub_data = Self::get_pub_key(path)?;
+        let xpub_data = &xpub_data[..194];
+
+        //get public key and chain code
+        let pub_key = &xpub_data[..130];
+        let sub_chain_code = &xpub_data[130..];
+        let pub_key_obj = PublicKey::from_str(pub_key)?;
+
+        //build parent public key obj
+        let parent_xpub_data = Self::get_pub_key(get_parent_path(path)?)?;
+        let parent_xpub_data = &parent_xpub_data[..194];
+        let parent_pub_key = &parent_xpub_data[..130];
+        let parent_chain_code = &parent_xpub_data[130..];
+        let parent_pub_key_obj = PublicKey::from_str(parent_pub_key)?;
+
+        //get parent public key fingerprint
+        let parent_chain_code = ChainCode::from(hex::decode(parent_chain_code)?.as_slice());
+        let parent_ext_pub_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: 0 as u8,
+            parent_fingerprint: Fingerprint::default(),
+            child_number: ChildNumber::from_normal_idx(0).unwrap(),
+            public_key: parent_pub_key_obj,
+            chain_code: parent_chain_code,
+        };
+        let fingerprint_obj = parent_ext_pub_key.fingerprint();
+
+        //build extend public key obj
+        let sub_chain_code_obj = ChainCode::from(hex::decode(sub_chain_code)?.as_slice());
+
+        let chain_number_vec: Vec<ChildNumber> = DerivationPath::from_str(path)?.into();
+        let extend_public_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: chain_number_vec.len() as u8,
+            parent_fingerprint: fingerprint_obj,
+            child_number: *chain_number_vec.get(chain_number_vec.len() - 1).unwrap(),
+            public_key: pub_key_obj,
+            chain_code: sub_chain_code_obj,
+        };
+        //get and return xpub
+        Ok(extend_public_key.to_string())
+    }
 }
 
 #[cfg(test)]
@@ -81,21 +148,20 @@ mod test {
         let pubkey_string = "04efb99d9860f4dec4cb548a5722c27e9ef58e37fbab9719c5b33d55c216db49311221a01f638ce5f255875b194e0acaa58b19a89d2e56a864427298f826a7f887";
 
         let address_derived =
-            EthAddress::address_from_pubkey(hex::decode(pubkey_string).unwrap()).unwrap();
-        println!("address is {}", address_derived);
+            EthAddress::from_pub_key(hex::decode(pubkey_string).unwrap()).unwrap();
         assert_eq!(
             address_derived,
-            "c2d7cf95645d33006175b78989035c7c9061d3f9".to_string()
+            "0xC2D7CF95645D33006175B78989035C7c9061d3F9".to_string()
         );
     }
 
     #[test]
     fn test_checksummed_address() {
         let address_orignial = "0xfb6916095ca1df60bb79ce92ce3ea74c37c5d359";
-        let address_checksummed = EthAddress::address_checksummed(address_orignial);
-        println!("checksummed address is {}", address_checksummed);
+        let address_checksum = EthAddress::address_checksum(address_orignial);
+        println!("checksummed address is {}", address_checksum);
         assert_eq!(
-            address_checksummed,
+            address_checksum,
             "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359".to_string()
         );
     }
diff --git a/imkey-core/ikc-wallet/coin-ethereum/src/ethapi.rs b/imkey-core/ikc-wallet/coin-ethereum/src/ethapi.rs
index ebdc1b50..8f82379f 100644
--- a/imkey-core/ikc-wallet/coin-ethereum/src/ethapi.rs
+++ b/imkey-core/ikc-wallet/coin-ethereum/src/ethapi.rs
@@ -1,51 +1,56 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EthTxInput {
     #[prost(string, tag = "1")]
-    pub nonce: std::string::String,
+    pub nonce: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub gas_price: std::string::String,
+    pub gas_price: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub gas_limit: std::string::String,
+    pub gas_limit: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub to: std::string::String,
+    pub to: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub value: std::string::String,
+    pub value: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
-    pub data: std::string::String,
+    pub data: ::prost::alloc::string::String,
     #[prost(string, tag = "7")]
-    pub chain_id: std::string::String,
+    pub chain_id: ::prost::alloc::string::String,
     #[prost(string, tag = "8")]
-    pub r#type: std::string::String,
+    pub r#type: ::prost::alloc::string::String,
     #[prost(string, tag = "9")]
-    pub max_fee_per_gas: std::string::String,
+    pub max_fee_per_gas: ::prost::alloc::string::String,
     #[prost(string, tag = "10")]
-    pub max_priority_fee_per_gas: std::string::String,
+    pub max_priority_fee_per_gas: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "11")]
-    pub access_list: ::std::vec::Vec<AccessList>,
+    pub access_list: ::prost::alloc::vec::Vec<AccessList>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccessList {
     #[prost(string, tag = "1")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(string, repeated, tag = "2")]
-    pub storage_keys: ::std::vec::Vec<std::string::String>,
+    pub storage_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EthTxOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub tx_hash: std::string::String,
+    pub tx_hash: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EthMessageInput {
     #[prost(string, tag = "1")]
-    pub message: std::string::String,
+    pub message: ::prost::alloc::string::String,
     #[prost(bool, tag = "2")]
     pub is_personal_sign: bool,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EthMessageOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-ethereum/src/lib.rs b/imkey-core/ikc-wallet/coin-ethereum/src/lib.rs
index 4c2c3089..cbd04e0b 100644
--- a/imkey-core/ikc-wallet/coin-ethereum/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-ethereum/src/lib.rs
@@ -2,16 +2,6 @@ pub mod address;
 pub mod ethapi;
 pub mod transaction;
 pub mod types;
-
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-ethereum/src/transaction.rs b/imkey-core/ikc-wallet/coin-ethereum/src/transaction.rs
index acf93d30..a8e91a8c 100644
--- a/imkey-core/ikc-wallet/coin-ethereum/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-ethereum/src/transaction.rs
@@ -12,9 +12,8 @@ use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
 use keccak_hash::keccak;
 use lazy_static::lazy_static;
-use rlp::{self, DecoderError, Encodable, Rlp, RlpStream};
-use secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
-use secp256k1::{self, Message as SecpMessage, Signature as SecpSignature};
+use rlp::{self, Encodable, RlpStream};
+use secp256k1::{self, ecdsa::Signature as SecpSignature};
 use tiny_keccak::Hasher;
 
 lazy_static! {
@@ -127,8 +126,7 @@ impl Transaction {
 
         let pubkey_raw = hex_to_bytes(&res_msg_pubkey[..130]).unwrap();
 
-        let address_main = EthAddress::address_from_pubkey(pubkey_raw.clone()).unwrap();
-        let address_checksummed = EthAddress::address_checksummed(&address_main);
+        let address_checksummed = EthAddress::from_pub_key(pubkey_raw.clone()).unwrap();
         //compare address
         if address_checksummed != *sender {
             return Err(CoinError::ImkeyAddressMismatchWithPath.into());
@@ -316,8 +314,7 @@ impl Transaction {
         let msg_pubkey = EthApdu::get_xpub(&sign_param.path, false);
         let res_msg_pubkey = send_apdu(msg_pubkey)?;
         let pubkey_raw = hex_to_bytes(&res_msg_pubkey[..130]).unwrap();
-        let address_main = EthAddress::address_from_pubkey(pubkey_raw.clone()).unwrap();
-        let address_checksummed = EthAddress::address_checksummed(&address_main);
+        let address_checksummed = EthAddress::from_pub_key(pubkey_raw.clone()).unwrap();
 
         if &address_checksummed != &sign_param.sender {
             return Err(CoinError::ImkeyAddressMismatchWithPath.into());
@@ -1084,7 +1081,7 @@ mod tests {
         let sender = "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string();
         let fee = "0.0032 ether".to_string();
 
-        let tx_result = tx
+        let _tx_result = tx
             .sign(Some(28), &path, &payment, &receiver, &sender, &fee)
             .unwrap();
 
@@ -1113,7 +1110,7 @@ mod tests {
         let sender = "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string();
         let fee = "0.002499941511088808 ether".to_string();
 
-        let tx_result = tx
+        let _tx_result = tx
             .sign(Some(28), &path, &payment, &receiver, &sender, &fee)
             .unwrap();
 
@@ -1142,7 +1139,7 @@ mod tests {
         let sender = "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string();
         let fee = "0.002654792885876068 ether".to_string();
 
-        let tx_result = tx
+        let _tx_result = tx
             .sign(Some(28), &path, &payment, &receiver, &sender, &fee)
             .unwrap();
 
@@ -1196,7 +1193,7 @@ mod tests {
         let sender = "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string();
         let fee = "0.0033 ether".to_string();
 
-        let tx_result = tx
+        let _tx_result = tx
             .sign(Some(63), &path, &payment, &receiver, &sender, &fee)
             .unwrap();
 
@@ -1225,7 +1222,7 @@ mod tests {
         let sender = "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string();
         let fee = "0.11 ether".to_string();
 
-        let tx_result = tx
+        let _tx_result = tx
             .sign(Some(28), &path, &payment, &receiver, &sender, &fee)
             .unwrap();
     }
diff --git a/imkey-core/ikc-wallet/coin-ethereum/src/types.rs b/imkey-core/ikc-wallet/coin-ethereum/src/types.rs
index 78e1e7fc..23507f38 100644
--- a/imkey-core/ikc-wallet/coin-ethereum/src/types.rs
+++ b/imkey-core/ikc-wallet/coin-ethereum/src/types.rs
@@ -1,5 +1,5 @@
 use ethereum_types::Address;
-use rlp::{self, DecoderError, Rlp, RlpStream};
+use rlp::{self, RlpStream};
 
 /// Transaction action type.
 #[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/imkey-core/ikc-wallet/coin-filecoin/Cargo.toml b/imkey-core/ikc-wallet/coin-filecoin/Cargo.toml
index d9e5fc07..a6305523 100644
--- a/imkey-core/ikc-wallet/coin-filecoin/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-filecoin/Cargo.toml
@@ -12,32 +12,31 @@ ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
 
 
-bitcoin_hashes = "0.11.0"
-hex = "0.4.3"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-ring = "0.16.20"
-bech32 = "0.9.1"
-num-bigint = "0.4.3"
-num-traits = "0.2.11"
-num-integer = "0.1.42"
-base64 = "0.13.1"
-failure = "0.1.8"
-bytes = "1.3.0"
-prost = "0.11.2"
-prost-types = "0.11.2"
-linked-hash-map = { version = "0.5", features = ["serde_impl"] }
+bitcoin_hashes = "=0.11.0"
+hex = "=0.4.3"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+bech32 = "=0.9.1"
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+num-integer = "=0.1.45"
+base64 = "=0.13.1"
+anyhow = "=1.0.79"
+bytes = "=1.4.0"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
+linked-hash-map = { version = "=0.5.6", features = ["serde_impl"] }
 
-base32 = "^0.4.0"
-blake2b-rs = "0.2.0"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_cbor = "0.11.1"
-serde_json = "1.0.89"
+base32 = "=0.4.0"
+blake2b-rs = "=0.2.0"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
 
-forest_vm = "0.3.0"
-forest_message = "0.6.0"
-forest_address = "0.3.0"
-forest_encoding = "0.2.0"
-forest_cid = "0.3.0"
-forest_crypto = "0.4.0"
-num_bigint_chainsafe = { package = "forest_bigint", version = "0.1.0"}
+forest_vm = "=0.3.2"
+forest_message = "=0.7.2"
+forest_address = "=0.3.2"
+forest_encoding = "=0.2.2"
+forest_cid = "=0.3.0"
+forest_crypto = "=0.5.3"
+num_bigint_chainsafe = { package = "forest_bigint", version = "=0.1.4"}
+bitcoin = "=0.29.2"
 
diff --git a/imkey-core/ikc-wallet/coin-filecoin/src/address.rs b/imkey-core/ikc-wallet/coin-filecoin/src/address.rs
index 931d0ddb..6e16de5c 100644
--- a/imkey-core/ikc-wallet/coin-filecoin/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-filecoin/src/address.rs
@@ -1,15 +1,20 @@
 use crate::utils::{digest, HashSize};
 use crate::Result;
+use std::str::FromStr;
 
 use base32::Alphabet;
+use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
 use hex;
 use ikc_common::apdu::{Apdu, ApduCheck, Secp256k1Apdu};
 use ikc_common::constants::FILECOIN_AID;
 use ikc_common::error::CoinError;
 use ikc_common::path;
+use ikc_common::path::{check_path_validity, get_parent_path};
 use ikc_common::utility;
+use ikc_common::utility::network_convert;
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message;
+use secp256k1::PublicKey;
 
 const MAINNET_PREFIX: &'static str = "f";
 const TESTNET_PREFIX: &'static str = "t";
@@ -59,7 +64,7 @@ impl FilecoinAddress {
             return Err(CoinError::ImkeySignatureVerifyFail.into());
         }
 
-        let uncomprs_pubkey: String = res_msg_pubkey.chars().take(130).collect();
+        let uncomprs_pubkey: String = res_msg_pubkey.chars().take(194).collect();
         Ok(uncomprs_pubkey)
     }
 
@@ -78,7 +83,7 @@ impl FilecoinAddress {
         };
 
         let uncomprs_pubkey = Self::get_pub_key(path).unwrap();
-        let pub_key_bytes = hex::decode(uncomprs_pubkey).unwrap();
+        let pub_key_bytes = hex::decode(&uncomprs_pubkey[..130]).unwrap();
         let protocol = Protocol::Secp256k1;
 
         let payload = Self::address_hash(&pub_key_bytes);
@@ -104,6 +109,78 @@ impl FilecoinAddress {
         ApduCheck::check_response(&res_reg)?;
         Ok(address)
     }
+
+    pub fn get_xpub(network: &str, path: &str) -> Result<String> {
+        //path check
+        check_path_validity(path)?;
+
+        //get xpub data
+        let xpub_data = Self::get_pub_key(path)?;
+        let xpub_data = &xpub_data[..194];
+
+        //get public key and chain code
+        let pub_key = &xpub_data[..130];
+        let sub_chain_code = &xpub_data[130..];
+        let pub_key_obj = PublicKey::from_str(pub_key)?;
+
+        //build parent public key obj
+        let parent_xpub_data = Self::get_pub_key(get_parent_path(path)?)?;
+        let parent_xpub_data = &parent_xpub_data[..194];
+        let parent_pub_key = &parent_xpub_data[..130];
+        let parent_chain_code = &parent_xpub_data[130..];
+        let parent_pub_key_obj = PublicKey::from_str(parent_pub_key)?;
+
+        //get parent public key fingerprint
+        let parent_chain_code = ChainCode::from(hex::decode(parent_chain_code)?.as_slice());
+        let network = network_convert(network);
+        let parent_ext_pub_key = ExtendedPubKey {
+            network,
+            depth: 0 as u8,
+            parent_fingerprint: Fingerprint::default(),
+            child_number: ChildNumber::from_normal_idx(0).unwrap(),
+            public_key: parent_pub_key_obj,
+            chain_code: parent_chain_code,
+        };
+        let fingerprint_obj = parent_ext_pub_key.fingerprint();
+
+        //build extend public key obj
+        let sub_chain_code_obj = ChainCode::from(hex::decode(sub_chain_code)?.as_slice());
+
+        let chain_number_vec: Vec<ChildNumber> = DerivationPath::from_str(path)?.into();
+        let extend_public_key = ExtendedPubKey {
+            network,
+            depth: chain_number_vec.len() as u8,
+            parent_fingerprint: fingerprint_obj,
+            child_number: *chain_number_vec.get(chain_number_vec.len() - 1).unwrap(),
+            public_key: pub_key_obj,
+            chain_code: sub_chain_code_obj,
+        };
+        //get and return xpub
+        Ok(extend_public_key.to_string())
+    }
+
+    pub fn from_pub_key(pub_key: Vec<u8>, network: &str) -> Result<String> {
+        let ntwk = match network {
+            "TESTNET" => TESTNET_PREFIX,
+            _ => MAINNET_PREFIX,
+        };
+
+        let pub_key_bytes = PublicKey::from_slice(pub_key.as_slice())?.serialize_uncompressed();
+        let protocol = Protocol::Secp256k1;
+        let payload = Self::address_hash(&pub_key_bytes);
+        let checksum = Self::checksum(&[vec![protocol as u8], payload.clone().to_vec()].concat());
+
+        Ok(format!(
+            "{}{}{}",
+            ntwk,
+            protocol as i8,
+            base32::encode(
+                Alphabet::RFC4648 { padding: false },
+                &[payload, checksum].concat()
+            )
+            .to_lowercase()
+        ))
+    }
 }
 
 #[cfg(test)]
@@ -119,7 +196,7 @@ mod test {
         let uncomprs_pubkey = FilecoinAddress::get_pub_key(constants::FILECOIN_PATH).unwrap();
         assert_eq!(
             &uncomprs_pubkey,
-            "044B9C3C0E1CEFD90897798E7CE471FEFF0D1BE4C6BA24061D7D9F68CFDB19A0EC0192392A94B121743ADB91C7029C6F3C80FD18B6E34E8B8F9EA87E559C68FDC4"
+            "044B9C3C0E1CEFD90897798E7CE471FEFF0D1BE4C6BA24061D7D9F68CFDB19A0EC0192392A94B121743ADB91C7029C6F3C80FD18B6E34E8B8F9EA87E559C68FDC41F7C8E9139DB9850A4E4AD3B91713D9ABD0C887141EBE0EBBD3B607FBC91B017"
         );
     }
 
diff --git a/imkey-core/ikc-wallet/coin-filecoin/src/filecoinapi.rs b/imkey-core/ikc-wallet/coin-filecoin/src/filecoinapi.rs
index 1773c7ff..92555e87 100644
--- a/imkey-core/ikc-wallet/coin-filecoin/src/filecoinapi.rs
+++ b/imkey-core/ikc-wallet/coin-filecoin/src/filecoinapi.rs
@@ -1,37 +1,40 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FilecoinTxInput {
     #[prost(string, tag = "1")]
-    pub to: std::string::String,
+    pub to: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub from: std::string::String,
+    pub from: ::prost::alloc::string::String,
     #[prost(uint64, tag = "3")]
     pub nonce: u64,
     #[prost(string, tag = "4")]
-    pub value: std::string::String,
+    pub value: ::prost::alloc::string::String,
     #[prost(int64, tag = "5")]
     pub gas_limit: i64,
     #[prost(string, tag = "6")]
-    pub gas_fee_cap: std::string::String,
+    pub gas_fee_cap: ::prost::alloc::string::String,
     #[prost(string, tag = "7")]
-    pub gas_premium: std::string::String,
+    pub gas_premium: ::prost::alloc::string::String,
     #[prost(uint64, tag = "8")]
     pub method: u64,
     #[prost(string, tag = "9")]
-    pub params: std::string::String,
+    pub params: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FilecoinTxOutput {
     #[prost(string, tag = "1")]
-    pub cid: std::string::String,
+    pub cid: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    pub message: ::std::option::Option<FilecoinTxInput>,
+    pub message: ::core::option::Option<FilecoinTxInput>,
     #[prost(message, optional, tag = "3")]
-    pub signature: ::std::option::Option<Signature>,
+    pub signature: ::core::option::Option<Signature>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Signature {
     #[prost(uint32, tag = "1")]
     pub r#type: u32,
     #[prost(string, tag = "2")]
-    pub data: std::string::String,
+    pub data: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-filecoin/src/lib.rs b/imkey-core/ikc-wallet/coin-filecoin/src/lib.rs
index 52bc91df..860702fb 100644
--- a/imkey-core/ikc-wallet/coin-filecoin/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-filecoin/src/lib.rs
@@ -3,14 +3,5 @@ pub mod filecoinapi;
 pub mod transaction;
 pub mod utils;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-#[macro_use]
-extern crate failure;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+extern crate anyhow;
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-filecoin/src/transaction.rs b/imkey-core/ikc-wallet/coin-filecoin/src/transaction.rs
index 26c34ed4..1338b936 100644
--- a/imkey-core/ikc-wallet/coin-filecoin/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-filecoin/src/transaction.rs
@@ -9,14 +9,14 @@ use ikc_common::utility::{hex_to_bytes, secp256k1_sign};
 use ikc_common::{constants, path, utility, SignParam};
 use ikc_device::device_binding::KEY_MANAGER;
 
+use anyhow::anyhow;
 use forest_address::Address;
 use forest_cid::Cid;
 use forest_encoding::Cbor;
 use forest_message::UnsignedMessage as ForestUnsignedMessage;
-use forest_vm::Serialized;
+use forest_vm::{Serialized, TokenAmount};
 use ikc_transport::message::send_apdu_timeout;
-use num_bigint_chainsafe::BigInt;
-use secp256k1::{self, Signature as SecpSignature};
+use secp256k1::ecdsa::Signature as SecpSignature;
 use std::str::FromStr;
 
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
@@ -26,12 +26,12 @@ impl Transaction {
     fn convert_message(message: &FilecoinTxInput) -> Result<ForestUnsignedMessage> {
         let to = Address::from_str(&message.to).map_err(|_| CoinError::InvalidAddress)?;
         let from = Address::from_str(&message.from).map_err(|_| CoinError::InvalidAddress)?;
-        let value = BigInt::from_str(&message.value).map_err(|_| CoinError::InvalidNumber)?;
+        let value = TokenAmount::from_str(&message.value).map_err(|_| CoinError::InvalidNumber)?;
         let gas_limit = message.gas_limit;
         let gas_fee_cap =
-            BigInt::from_str(&message.gas_fee_cap).map_err(|_| CoinError::InvalidNumber)?;
+            TokenAmount::from_str(&message.gas_fee_cap).map_err(|_| CoinError::InvalidNumber)?;
         let gas_premium =
-            BigInt::from_str(&message.gas_premium).map_err(|_| CoinError::InvalidNumber)?;
+            TokenAmount::from_str(&message.gas_premium).map_err(|_| CoinError::InvalidNumber)?;
 
         let message_params_bytes =
             base64::decode(&message.params).map_err(|_| CoinError::InvalidParam)?;
@@ -144,7 +144,7 @@ impl Transaction {
         };
         cid = forest_signed_msg
             .cid()
-            .map_err(|_e| format_err!("{}", "forest_message cid error"))?;
+            .map_err(|_e| anyhow!("{}", "forest_message cid error"))?;
 
         let signature_type = 1;
 
diff --git a/imkey-core/ikc-wallet/coin-substrate/Cargo.toml b/imkey-core/ikc-wallet/coin-substrate/Cargo.toml
index f18c8012..63f673e5 100644
--- a/imkey-core/ikc-wallet/coin-substrate/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-substrate/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2018"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-sp-core = "7.0.0"
-failure = "0.1.8"
-hex = "0.4.3"
-prost = "0.11.2"
-prost-types = "0.11.2"
+sp-core = "=7.0.0"
+anyhow = "=1.0.79"
+hex = "=0.4.3"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
 
 
 [dev-dependencies]
-sp-runtime = "7.0.0"
-sp-keyring = "7.0.0"
\ No newline at end of file
+sp-runtime = "=7.0.0"
+sp-keyring = "=7.0.0"
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-substrate/src/address.rs b/imkey-core/ikc-wallet/coin-substrate/src/address.rs
index ff342bd2..3c2625d4 100644
--- a/imkey-core/ikc-wallet/coin-substrate/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-substrate/src/address.rs
@@ -1,15 +1,14 @@
 use crate::Result;
-use ikc_common::apdu::{Apdu, ApduCheck, BtcApdu, CoinCommonApdu, Ed25519Apdu};
+use ikc_common::apdu::{Apdu, ApduCheck, Ed25519Apdu};
 use ikc_common::constants::{KUSAMA_AID, POLKADOT_AID};
 use ikc_common::error::CoinError;
-use ikc_common::path::check_path_validity;
-use ikc_common::utility::{secp256k1_sign, secp256k1_sign_verify, uncompress_pubkey_2_compress};
+use ikc_common::path::check_path_max_five_depth;
+use ikc_common::utility::{secp256k1_sign, secp256k1_sign_verify};
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::send_apdu;
 use sp_core::crypto::{Ss58AddressFormat, Ss58Codec};
 use sp_core::ed25519::Public;
 use sp_core::ByteArray;
-use sp_core::Public as TraitPublic;
 use std::str::FromStr;
 
 pub struct SubstrateAddress();
@@ -23,19 +22,17 @@ impl SubstrateAddress {
             AddressType::Kusama => {
                 public_obj.to_ss58check_with_version(Ss58AddressFormat::custom(2))
             }
-            _ => panic!("address type not support"),
         };
 
         Ok(address)
     }
 
     pub fn get_public_key(path: &str, address_type: &AddressType) -> Result<String> {
-        check_path_validity(path).expect("check path error");
+        check_path_max_five_depth(path)?;
 
         let aid = match address_type {
             AddressType::Polkadot => POLKADOT_AID,
             AddressType::Kusama => KUSAMA_AID,
-            _ => panic!("address type not support"),
         };
         let select_apdu = Apdu::select_applet(aid);
         let select_response = send_apdu(select_apdu)?;
@@ -60,8 +57,6 @@ impl SubstrateAddress {
         let pubkey = &res_msg_pubkey[..64];
         let sign_result = &res_msg_pubkey[64..res_msg_pubkey.len() - 4];
 
-        println!("pubkey: {}", pubkey);
-
         //verify
         let sign_verify_result = secp256k1_sign_verify(
             &key_manager_obj.se_pub_key,
@@ -72,7 +67,7 @@ impl SubstrateAddress {
             return Err(CoinError::ImkeySignatureVerifyFail.into());
         }
 
-        Ok(pubkey.to_string())
+        Ok(pubkey.to_lowercase())
     }
 
     pub fn get_address(path: &str, address_type: &AddressType) -> Result<String> {
@@ -86,7 +81,6 @@ impl SubstrateAddress {
         let menu_name = match address_type {
             AddressType::Polkadot => "DOT",
             AddressType::Kusama => "KSM",
-            _ => panic!("address type not support"),
         };
         let reg_apdu = Ed25519Apdu::register_address(menu_name.as_bytes(), address.as_bytes());
         let res_reg = send_apdu(reg_apdu)?;
@@ -101,15 +95,22 @@ pub enum AddressType {
     Kusama,
 }
 
+impl FromStr for AddressType {
+    type Err = anyhow::Error;
+    fn from_str(s: &str) -> Result<Self> {
+        match s {
+            "POLKADOT" => Ok(AddressType::Polkadot),
+            "KUSAMA" => Ok(AddressType::Kusama),
+            _ => Err(CoinError::AddressTypeMismatch.into()),
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use crate::address::{AddressType, SubstrateAddress};
     use ikc_common::constants::{KUSAMA_PATH, POLKADOT_PATH};
     use ikc_device::device_binding::bind_test;
-    use sp_core::crypto::Ss58AddressFormat;
-    use sp_core::crypto::Ss58Codec;
-    use sp_core::sr25519::{Pair, Public};
-    use sp_core::Pair as TraitPair;
 
     #[test]
     fn test_address_from_public() {
diff --git a/imkey-core/ikc-wallet/coin-substrate/src/lib.rs b/imkey-core/ikc-wallet/coin-substrate/src/lib.rs
index 29de5b63..189a78a6 100644
--- a/imkey-core/ikc-wallet/coin-substrate/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-substrate/src/lib.rs
@@ -2,18 +2,9 @@ pub mod address;
 pub mod substrateapi;
 pub mod transaction;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
+pub type Result<T> = result::Result<T, anyhow::Error>;
 
 pub(crate) const SIGNATURE_TYPE_ED25519: u8 = 0x00;
-pub(crate) const SIGNATURE_TYPE_SR25519: u8 = 0x01;
+// pub(crate) const SIGNATURE_TYPE_SR25519: u8 = 0x01;
 pub(crate) const PAYLOAD_HASH_THRESHOLD: usize = 256;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
diff --git a/imkey-core/ikc-wallet/coin-substrate/src/substrateapi.rs b/imkey-core/ikc-wallet/coin-substrate/src/substrateapi.rs
index 0fd3fbd5..dbca51f7 100644
--- a/imkey-core/ikc-wallet/coin-substrate/src/substrateapi.rs
+++ b/imkey-core/ikc-wallet/coin-substrate/src/substrateapi.rs
@@ -1,10 +1,12 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SubstrateRawTxIn {
     #[prost(string, tag = "1")]
-    pub raw_data: std::string::String,
+    pub raw_data: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SubstrateTxOut {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-substrate/src/transaction.rs b/imkey-core/ikc-wallet/coin-substrate/src/transaction.rs
index 17a23741..8f595b8d 100644
--- a/imkey-core/ikc-wallet/coin-substrate/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-substrate/src/transaction.rs
@@ -1,4 +1,3 @@
-use crate::address::AddressType;
 use crate::substrateapi::{SubstrateRawTxIn, SubstrateTxOut};
 use crate::{Result, PAYLOAD_HASH_THRESHOLD, SIGNATURE_TYPE_ED25519};
 use ikc_common::apdu::{Apdu, ApduCheck, Ed25519Apdu};
@@ -15,6 +14,7 @@ use sp_core::blake2_256;
 pub struct Transaction {}
 
 impl Transaction {
+    // Ref: https://github.com/paritytech/txwrapper-core/blob/8c7c9e16ab877f0247e547ee6368e22e5579b492/packages/txwrapper-core/src/core/construct/createSigningPayload.ts#L37-L42
     pub fn hash_unsigned_payload(payload: &[u8]) -> Result<Vec<u8>> {
         if payload.len() > PAYLOAD_HASH_THRESHOLD {
             Ok(blake2_256(&payload).to_vec())
@@ -113,10 +113,8 @@ mod test {
     use ikc_common::constants::{KUSAMA_PATH, POLKADOT_PATH};
     use ikc_common::SignParam;
     use ikc_device::device_binding::bind_test;
-    use sp_core::crypto::Ss58Codec;
     use sp_core::ed25519::Pair;
-    use sp_core::{ByteArray, Pair as TraitPair, Public};
-    use sp_runtime::traits::Verify;
+    use sp_core::{ByteArray, Pair as TraitPair};
 
     #[test]
     fn test_sign_transaction() {
diff --git a/imkey-core/ikc-wallet/coin-tezos/Cargo.toml b/imkey-core/ikc-wallet/coin-tezos/Cargo.toml
index 4c0dcb4b..e1faf883 100644
--- a/imkey-core/ikc-wallet/coin-tezos/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-tezos/Cargo.toml
@@ -11,9 +11,9 @@ ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
 
-hex = "0.4.3"
-blake2b_simd = "1.0.0"
-bitcoin = "0.29.2"
-failure = "0.1.8"
-prost = "0.11.2"
-prost-types = "0.11.2"
+hex = "=0.4.3"
+blake2b_simd = "=1.0.1"
+bitcoin = "=0.29.2"
+anyhow = "=1.0.79"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
diff --git a/imkey-core/ikc-wallet/coin-tezos/src/address.rs b/imkey-core/ikc-wallet/coin-tezos/src/address.rs
index 8249eb7b..442d4791 100644
--- a/imkey-core/ikc-wallet/coin-tezos/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-tezos/src/address.rs
@@ -32,7 +32,7 @@ impl TezosAddress {
         Ok(address)
     }
 
-    fn get_pub_key(path: &str) -> Result<String> {
+    pub fn get_pub_key(path: &str) -> Result<String> {
         //path check
         check_path_validity(path)?;
 
diff --git a/imkey-core/ikc-wallet/coin-tezos/src/lib.rs b/imkey-core/ikc-wallet/coin-tezos/src/lib.rs
index 6f23aa44..4dd25f53 100644
--- a/imkey-core/ikc-wallet/coin-tezos/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-tezos/src/lib.rs
@@ -2,14 +2,5 @@ pub mod address;
 pub mod tezosapi;
 pub mod transaction;
 use core::result;
-#[macro_use]
-extern crate failure;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+extern crate anyhow;
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-tezos/src/tezosapi.rs b/imkey-core/ikc-wallet/coin-tezos/src/tezosapi.rs
index 7a6bc93c..b2dff2ca 100644
--- a/imkey-core/ikc-wallet/coin-tezos/src/tezosapi.rs
+++ b/imkey-core/ikc-wallet/coin-tezos/src/tezosapi.rs
@@ -1,14 +1,16 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TezosTxInput {
     #[prost(string, tag = "1")]
-    pub raw_data: std::string::String,
+    pub raw_data: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TezosTxOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub edsig: std::string::String,
+    pub edsig: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub sbytes: std::string::String,
+    pub sbytes: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc-wallet/coin-tezos/src/transaction.rs b/imkey-core/ikc-wallet/coin-tezos/src/transaction.rs
index 13300f71..e3d003af 100644
--- a/imkey-core/ikc-wallet/coin-tezos/src/transaction.rs
+++ b/imkey-core/ikc-wallet/coin-tezos/src/transaction.rs
@@ -120,41 +120,41 @@ impl Transaction {
 
 #[cfg(test)]
 mod test {
-    use crate::tezosapi::TezosTxInput;
-    use crate::transaction::Transaction;
-    use ikc_common::SignParam;
-    use ikc_device::device_binding::bind_test;
-    use ikc_transport::hid_api::hid_connect;
+    // use crate::tezosapi::TezosTxInput;
+    // use crate::transaction::Transaction;
+    // use ikc_common::SignParam;
+    // use ikc_device::device_binding::bind_test;
+    // use ikc_transport::hid_api::hid_connect;
 
-    #[test]
-    fn tx_sign_test() {
-        assert!(hid_connect("imKey Pro").is_ok());
-        bind_test();
-        let tezos_tx_input = TezosTxInput{
-            to: "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy".to_string(),
-            from: "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz".to_string(),
-            value: "".to_string(),
-            raw_data: "d3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700".to_string()
-        };
+    // #[test]
+    // fn tx_sign_test() {
+    //     assert!(hid_connect("imKey Pro").is_ok());
+    //     bind_test();
+    //     let tezos_tx_input = TezosTxInput{
+    //         to: "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy".to_string(),
+    //         from: "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz".to_string(),
+    //         value: "".to_string(),
+    //         raw_data: "d3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700".to_string()
+    //     };
 
-        let sign_param = SignParam {
-            chain_type: "TEZOS".to_string(),
-            path: "m/44'/1729'/0'/0'".to_string(),
-            network: "MAINNET".to_string(),
-            input: None,
-            payment: "1 XTZ".to_string(),
-            receiver: "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy".to_string(),
-            sender: "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz".to_string(),
-            fee: "0.1 XTZ".to_string(),
-        };
-        let sign_result = Transaction::sign_tx(tezos_tx_input, sign_param);
-        if sign_result.is_ok() {
-            let tezosTxOutput = sign_result.unwrap();
-            assert_eq!("0DF020458BDCFE24546488DD81E1BD7E2CB05379DC7C72AD626646AE22DF5D3A652FDC4FFD2383DD5823A98FE158780928DA07A3F0A234E23B759CE7B3A39A0C", tezosTxOutput.signature);
-            assert_eq!("edsigtZdXPNY5QEakVWmib9RGM6nzkix5TM4GyKjez9uT9VtBV1xPLAV17YK6pQwFk2cvQXZrpE22AaUYhLkVbTjN5uvk3RXyKn", tezosTxOutput.edsig);
-            assert_eq!("d3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700400DF020458BDCFE24546488DD81E1BD7E2CB05379DC7C72AD626646AE22DF5D3A652FDC4FFD2383DD5823A98FE158780928DA07A3F0A234E23B759CE7B3A39A0C", tezosTxOutput.sbytes);
-        } else {
-            panic!("sign error");
-        }
-    }
+    //     let sign_param = SignParam {
+    //         chain_type: "TEZOS".to_string(),
+    //         path: "m/44'/1729'/0'/0'".to_string(),
+    //         network: "MAINNET".to_string(),
+    //         input: None,
+    //         payment: "1 XTZ".to_string(),
+    //         receiver: "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy".to_string(),
+    //         sender: "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz".to_string(),
+    //         fee: "0.1 XTZ".to_string(),
+    //     };
+    //     let sign_result = Transaction::sign_tx(tezos_tx_input, sign_param);
+    //     if sign_result.is_ok() {
+    //         let tezosTxOutput = sign_result.unwrap();
+    //         assert_eq!("0DF020458BDCFE24546488DD81E1BD7E2CB05379DC7C72AD626646AE22DF5D3A652FDC4FFD2383DD5823A98FE158780928DA07A3F0A234E23B759CE7B3A39A0C", tezosTxOutput.signature);
+    //         assert_eq!("edsigtZdXPNY5QEakVWmib9RGM6nzkix5TM4GyKjez9uT9VtBV1xPLAV17YK6pQwFk2cvQXZrpE22AaUYhLkVbTjN5uvk3RXyKn", tezosTxOutput.edsig);
+    //         assert_eq!("d3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700400DF020458BDCFE24546488DD81E1BD7E2CB05379DC7C72AD626646AE22DF5D3A652FDC4FFD2383DD5823A98FE158780928DA07A3F0A234E23B759CE7B3A39A0C", tezosTxOutput.sbytes);
+    //     } else {
+    //         panic!("sign error");
+    //     }
+    // }
 }
diff --git a/imkey-core/ikc-wallet/coin-tron/Cargo.toml b/imkey-core/ikc-wallet/coin-tron/Cargo.toml
index a2c1f05e..b6afdca3 100644
--- a/imkey-core/ikc-wallet/coin-tron/Cargo.toml
+++ b/imkey-core/ikc-wallet/coin-tron/Cargo.toml
@@ -7,13 +7,14 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-keccak-hash = "0.10.0"
-failure = "0.1.8"
-bitcoin = "0.29.2"
-hex = "0.4.3"
+keccak-hash = "=0.10.0"
+anyhow = "=1.0.79"
+bitcoin = "=0.29.2"
+hex = "=0.4.3"
 ikc-common = {path = "../../ikc-common"}
 ikc-device = {path = "../../ikc-device"}
 ikc-transport = {path = "../../ikc-transport"}
-prost = "0.11.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-keccak = { version = "2.0.2", features = ["keccak"] }
\ No newline at end of file
+prost = "=0.11.2"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+tiny-keccak = { version = "=2.0.2", features = ["keccak"] }
+byteorder = "=1.4.3"
\ No newline at end of file
diff --git a/imkey-core/ikc-wallet/coin-tron/src/address.rs b/imkey-core/ikc-wallet/coin-tron/src/address.rs
index 9a57b9b3..eb732b3a 100644
--- a/imkey-core/ikc-wallet/coin-tron/src/address.rs
+++ b/imkey-core/ikc-wallet/coin-tron/src/address.rs
@@ -1,27 +1,52 @@
 use crate::Result;
 use bitcoin::util::base58;
-use ikc_common::apdu::{Apdu, ApduCheck, CoinCommonApdu, Secp256k1Apdu};
+use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
+use bitcoin::Network;
+use byteorder::{BigEndian, ByteOrder};
+use ikc_common::apdu::{Apdu, ApduCheck, Secp256k1Apdu};
 use ikc_common::constants::TRON_AID;
 use ikc_common::error::CoinError;
-use ikc_common::path::check_path_validity;
+use ikc_common::path::{check_path_validity, get_parent_path};
 use ikc_common::utility;
 use ikc_common::utility::secp256k1_sign;
 use ikc_device::device_binding::KEY_MANAGER;
 use ikc_transport::message::send_apdu;
 use keccak_hash::keccak;
+use secp256k1::PublicKey;
+use std::convert::TryFrom;
+use std::str::FromStr;
 
 pub struct TronAddress {}
 
 impl TronAddress {
-    pub fn address_from_pubkey(pubkey: &[u8]) -> Result<String> {
-        let pubkey_hash = keccak(pubkey[1..].as_ref());
-        let address = [vec![0x41], pubkey_hash[12..].to_vec()].concat();
+    pub fn from_pub_key(pub_key: &[u8]) -> Result<String> {
+        let public_key = PublicKey::from_slice(pub_key)?.serialize_uncompressed();
+        let keccak_hash = keccak(public_key[1..].as_ref());
+        let address = [vec![0x41], keccak_hash[12..].to_vec()].concat();
         let base58_address = base58::check_encode_slice(&address);
         Ok(base58_address)
     }
 
     pub fn get_address(path: &str) -> Result<String> {
-        check_path_validity(path).unwrap();
+        check_path_validity(path)?;
+
+        let pubkey_raw = TronAddress::get_pub_key(path)?;
+
+        let address = TronAddress::from_pub_key(&pubkey_raw[..65])?;
+        Ok(address)
+    }
+
+    pub fn display_address(path: &str) -> Result<String> {
+        let address = TronAddress::get_address(path).unwrap();
+        let tron_menu_name = "TRX".as_bytes();
+        let reg_apdu = Secp256k1Apdu::register_address(tron_menu_name, address.as_bytes());
+        let res_reg = send_apdu(reg_apdu)?;
+        ApduCheck::check_response(&res_reg)?;
+        Ok(address)
+    }
+
+    pub fn get_pub_key(path: &str) -> Result<Vec<u8>> {
+        check_path_validity(path)?;
 
         let select_apdu = Apdu::select_applet(TRON_AID);
         let select_response = send_apdu(select_apdu)?;
@@ -56,34 +81,73 @@ impl TronAddress {
             return Err(CoinError::ImkeySignatureVerifyFail.into());
         }
 
-        let pubkey_raw = hex::decode(&res_msg_pubkey[..130]).unwrap();
+        // Ok(hex::decode(&res_msg_pubkey[..130])?)
+        Ok(hex::decode(sign_source_val)?)
+    }
 
-        let address = TronAddress::address_from_pubkey(pubkey_raw.as_slice())?;
-        Ok(address)
+    pub fn get_xpub(path: &str) -> Result<String> {
+        //path check
+        check_path_validity(path)?;
+
+        let pub_key = hex::encode(Self::get_pub_key(get_parent_path(path)?)?);
+        let sub_pub_key = PublicKey::from_str(&pub_key[..130])?;
+        let chain_code_obj = ChainCode::try_from(hex::decode(&pub_key[130..])?.as_slice())?;
+        let ext_pub_key = ExtendedPubKey {
+            network: Network::Testnet,
+            depth: 0u8,
+            parent_fingerprint: Fingerprint::default(),
+            child_number: ChildNumber::from_normal_idx(0).unwrap(),
+            public_key: sub_pub_key,
+            chain_code: chain_code_obj,
+        };
+        let fingerprint_obj = ext_pub_key.fingerprint();
+
+        let pub_key = hex::encode(Self::get_pub_key(path)?);
+        let sub_pub_key = PublicKey::from_str(&pub_key[..130])?;
+        let chain_code_obj = ChainCode::try_from(hex::decode(&pub_key[130..])?.as_slice())?;
+        let chain_number_vec: Vec<ChildNumber> = DerivationPath::from_str(path)?.into();
+        let ext_pub_key = ExtendedPubKey {
+            network: Network::Bitcoin,
+            depth: chain_number_vec.len() as u8,
+            parent_fingerprint: fingerprint_obj,
+            child_number: *chain_number_vec.get(chain_number_vec.len() - 1).unwrap(),
+            public_key: sub_pub_key,
+            chain_code: chain_code_obj,
+        };
+
+        Ok(ext_pub_key.to_string())
     }
 
-    pub fn display_address(path: &str) -> Result<String> {
-        let address = TronAddress::get_address(path).unwrap();
-        let tron_menu_name = "TRX".as_bytes();
-        let reg_apdu = Secp256k1Apdu::register_address(tron_menu_name, address.as_bytes());
-        let res_reg = send_apdu(reg_apdu)?;
-        ApduCheck::check_response(&res_reg)?;
-        Ok(address)
+    fn to_ss58check_with_version(extended_key: ExtendedPubKey, version: &[u8]) -> String {
+        let mut ret = [0; 78];
+        // let extended_key = self.0;
+        ret[0..4].copy_from_slice(version);
+        ret[4] = extended_key.depth;
+        ret[5..9].copy_from_slice(&extended_key.parent_fingerprint[..]);
+
+        BigEndian::write_u32(&mut ret[9..13], u32::from(extended_key.child_number));
+
+        ret[13..45].copy_from_slice(&extended_key.chain_code[..]);
+        ret[45..78].copy_from_slice(&extended_key.public_key.serialize()[..]);
+        base58::check_encode_slice(&ret[..])
     }
 }
 
 #[cfg(test)]
 mod tests {
     use crate::address::TronAddress;
+    use bitcoin::util::bip32::ExtendedPubKey;
     use ikc_common::constants;
+    use ikc_common::path::get_account_path;
     use ikc_device::device_binding::bind_test;
+    use std::str::FromStr;
 
     #[test]
     fn tron_address() {
         let bytes = hex::decode("04DAAC763B1B3492720E404C53D323BAF29391996F7DD5FA27EF0D12F7D50D694700684A32AD97FF4C09BF9CF0B9D0AC7F0091D9C6CB8BE9BB6A1106DA557285D8").unwrap();
 
         assert_eq!(
-            TronAddress::address_from_pubkey(&bytes).unwrap(),
+            TronAddress::from_pub_key(&bytes).unwrap(),
             "THfuSDVRvSsjNDPFdGjMU19Ha4Kf7acotq"
         );
     }
@@ -102,4 +166,16 @@ mod tests {
         println!("address:{}", &address);
         assert_eq!(&address, "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2");
     }
+
+    #[test]
+    fn test_get_xpub() {
+        bind_test();
+        let xpub = TronAddress::get_xpub(&get_account_path("m/44'/195'/0'/0/0").unwrap()).unwrap();
+        let extended_pub_key = ExtendedPubKey::from_str(&xpub).unwrap();
+        let res = TronAddress::to_ss58check_with_version(
+            extended_pub_key,
+            &hex::decode("043587cf").unwrap(),
+        );
+        assert_eq!("tpubDCxD6k9PreNhSacpfSZ3iErESZnncY1n7qU7e3stZXLPh84xVVt5ERMAqKeefUU8jswx2GpCkQpeYow4xH3PGx2iim6ftPa32GNvTKAtknz", res);
+    }
 }
diff --git a/imkey-core/ikc-wallet/coin-tron/src/lib.rs b/imkey-core/ikc-wallet/coin-tron/src/lib.rs
index 4dc27b39..7dceabf7 100644
--- a/imkey-core/ikc-wallet/coin-tron/src/lib.rs
+++ b/imkey-core/ikc-wallet/coin-tron/src/lib.rs
@@ -1,16 +1,6 @@
 pub mod address;
 pub mod signer;
 pub mod tronapi;
-
-#[macro_use]
-extern crate failure;
+extern crate anyhow;
 use core::result;
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/imkey-core/ikc-wallet/coin-tron/src/signer.rs b/imkey-core/ikc-wallet/coin-tron/src/signer.rs
index 7bcc1298..43fbcab7 100644
--- a/imkey-core/ikc-wallet/coin-tron/src/signer.rs
+++ b/imkey-core/ikc-wallet/coin-tron/src/signer.rs
@@ -1,16 +1,15 @@
 use crate::address::TronAddress;
 use crate::tronapi::{TronMessageInput, TronMessageOutput, TronTxInput, TronTxOutput};
 use crate::Result;
-use ikc_common::apdu::{Apdu, ApduCheck, CoinCommonApdu, Secp256k1Apdu};
+use ikc_common::apdu::{Apdu, ApduCheck, Secp256k1Apdu};
 use ikc_common::constants::TRON_AID;
 use ikc_common::error::CoinError;
 use ikc_common::path::check_path_validity;
-use ikc_common::utility::{is_valid_hex, secp256k1_sign, sha256_hash};
+use ikc_common::utility::{secp256k1_sign, sha256_hash};
 use ikc_common::{constants, utility, SignParam};
 use ikc_device::device_binding::KEY_MANAGER;
-use ikc_device::key_manager::KeyManager;
 use ikc_transport::message::{send_apdu, send_apdu_timeout};
-use secp256k1::{self, Message as SecpMessage, Signature as SecpSignature};
+use secp256k1::{self, ecdsa::Signature as SecpSignature};
 use tiny_keccak::Hasher;
 
 #[derive(Debug)]
@@ -33,6 +32,8 @@ impl TronSigner {
             }
             false => input.message.into_bytes(),
         };
+
+        // this code is from tron wallet
         let header = match input.is_tron_header {
             true => "\x19TRON Signed Message:\n32".as_bytes(),
             false => "\x19Ethereum Signed Message:\n32".as_bytes(),
@@ -138,7 +139,7 @@ impl TronSigner {
         let msg_pubkey = Secp256k1Apdu::get_xpub(&path_pack);
         let res_msg_pubkey = send_apdu(msg_pubkey)?;
         let pubkey_raw = hex::decode(&res_msg_pubkey[..130]).unwrap();
-        let address = TronAddress::address_from_pubkey(pubkey_raw.as_slice()).unwrap();
+        let address = TronAddress::from_pub_key(pubkey_raw.as_slice()).unwrap();
         if !sender.to_string().is_empty() && &address != sender {
             return Err(CoinError::ImkeyAddressMismatchWithPath.into());
         }
diff --git a/imkey-core/ikc-wallet/coin-tron/src/tronapi.rs b/imkey-core/ikc-wallet/coin-tron/src/tronapi.rs
index 5e9a3828..ffd477e6 100644
--- a/imkey-core/ikc-wallet/coin-tron/src/tronapi.rs
+++ b/imkey-core/ikc-wallet/coin-tron/src/tronapi.rs
@@ -1,24 +1,28 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TronTxInput {
     #[prost(string, tag = "2")]
-    pub raw_data: std::string::String,
+    pub raw_data: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TronTxOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TronMessageInput {
     #[prost(string, tag = "2")]
-    pub message: std::string::String,
+    pub message: ::prost::alloc::string::String,
     #[prost(bool, tag = "4")]
     pub is_hex: bool,
     #[prost(bool, tag = "5")]
     pub is_tron_header: bool,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TronMessageOutput {
     #[prost(string, tag = "1")]
-    pub signature: std::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
diff --git a/imkey-core/ikc/Cargo.toml b/imkey-core/ikc/Cargo.toml
index 3980fe0e..f05d958f 100644
--- a/imkey-core/ikc/Cargo.toml
+++ b/imkey-core/ikc/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lazy_static = "1.4.0"
+lazy_static = "=1.4.0"
 
-log = {version = "0.4.17", features = ["std"]}
+log = {version = "=0.4.17", features = ["std"]}
 ikc-transport = {path = "../ikc-transport"}
 ikc-device = {path = "../ikc-device"}
 coin-ethereum = {path = "../ikc-wallet/coin-ethereum"}
@@ -25,17 +25,17 @@ coin-btc-fork = {path = "../ikc-wallet/coin-btc-fork"}
 
 ikc-common = {path = "../ikc-common"}
 coin-tezos = {path = "../ikc-wallet/coin-tezos"}
-bitcoin = "0.29.2"
-ethereum-types = "0.14.0"
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
-hex = "0.4.3"
-failure = "0.1.8"
-linked-hash-map = { version = "0.5", features = ["serde_impl"] }
-serde_json = { version = "1.0.89", default-features = false, features = ["alloc"] }
-base64 = "0.13.1"
-parking_lot = "0.12.1"
+bitcoin = "=0.29.2"
+ethereum-types = "=0.14.0"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
+hex = "=0.4.3"
+anyhow = "=1.0.79"
+linked-hash-map = { version = "=0.5.6", features = ["serde_impl"] }
+serde_json = { version = "=1.0.89", default-features = false, features = ["alloc"] }
+base64 = "=0.13.1"
+parking_lot = "=0.12.1"
 
 [lib]
 name="connector"
diff --git a/imkey-core/ikc/src/api.rs b/imkey-core/ikc/src/api.rs
index acb88fbf..939d8e34 100644
--- a/imkey-core/ikc/src/api.rs
+++ b/imkey-core/ikc/src/api.rs
@@ -3,145 +3,269 @@
 /// the real action and param field is the real param of that method.
 /// When an error occurred, the `call_imkey_api` will return a `Response` which isSuccess field be false and error field is the reason
 /// which cause the error.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ImkeyAction {
     #[prost(string, tag = "1")]
-    pub method: std::string::String,
+    pub method: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    pub param: ::std::option::Option<::prost_types::Any>,
+    pub param: ::core::option::Option<::prost_types::Any>,
 }
 /// A common response when error occurred.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ErrorResponse {
     #[prost(bool, tag = "1")]
     pub is_success: bool,
     #[prost(string, tag = "2")]
-    pub error: std::string::String,
+    pub error: ::prost::alloc::string::String,
 }
-///A commonresponse when successfully ended.
+/// A commonresponse when successfully ended.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommonResponse {
     #[prost(string, tag = "1")]
-    pub result: std::string::String,
+    pub result: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AddressParam {
     #[prost(string, tag = "1")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub network: std::string::String,
+    pub network: ::prost::alloc::string::String,
     #[prost(bool, tag = "4")]
     pub is_seg_wit: bool,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AddressResult {
     #[prost(string, tag = "1")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PubKeyParam {
     #[prost(string, tag = "1")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub network: std::string::String,
+    pub network: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub is_seg_wit: std::string::String,
+    pub is_seg_wit: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PubKeyResult {
     #[prost(string, tag = "1")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub pub_key: std::string::String,
+    pub pub_key: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub derived_mode: std::string::String,
+    pub derived_mode: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExternalAddress {
     #[prost(string, tag = "1")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub derived_path: std::string::String,
+    pub derived_path: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub r#type: std::string::String,
+    pub r#type: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BitcoinWallet {
     #[prost(string, tag = "1")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub enc_x_pub: std::string::String,
+    pub enc_x_pub: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "5")]
-    pub external_address: ::std::option::Option<ExternalAddress>,
+    pub external_address: ::core::option::Option<ExternalAddress>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EosWallet {
     #[prost(string, tag = "1")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "3")]
-    pub public_keys: ::std::vec::Vec<eos_wallet::PubKeyInfo>,
+    pub public_keys: ::prost::alloc::vec::Vec<eos_wallet::PubKeyInfo>,
 }
+/// Nested message and enum types in `EosWallet`.
 pub mod eos_wallet {
+    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct PubKeyInfo {
         #[prost(string, tag = "1")]
-        pub path: std::string::String,
+        pub path: ::prost::alloc::string::String,
         #[prost(string, tag = "2")]
-        pub derived_mode: std::string::String,
+        pub derived_mode: ::prost::alloc::string::String,
         #[prost(string, tag = "3")]
-        pub public_key: std::string::String,
+        pub public_key: ::prost::alloc::string::String,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExternalAddressParam {
     #[prost(string, tag = "1")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub network: std::string::String,
+    pub network: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub seg_wit: std::string::String,
+    pub seg_wit: ::prost::alloc::string::String,
     #[prost(int32, tag = "5")]
     pub external_idx: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct InitImKeyCoreXParam {
     #[prost(string, tag = "1")]
-    pub file_dir: std::string::String,
+    pub file_dir: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub xpub_common_key: std::string::String,
+    pub xpub_common_key: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub xpub_common_iv: std::string::String,
+    pub xpub_common_iv: ::prost::alloc::string::String,
     #[prost(bool, tag = "4")]
     pub is_debug: bool,
     #[prost(string, tag = "5")]
-    pub system: std::string::String,
+    pub system: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BtcForkWallet {
     #[prost(string, tag = "1")]
-    pub path: std::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: std::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub address: std::string::String,
+    pub address: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub enc_x_pub: std::string::String,
+    pub enc_x_pub: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeriveAccountsParam {
+    #[prost(message, repeated, tag = "1")]
+    pub derivations: ::prost::alloc::vec::Vec<derive_accounts_param::Derivation>,
+}
+/// Nested message and enum types in `DeriveAccountsParam`.
+pub mod derive_accounts_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct Derivation {
+        #[prost(string, tag = "1")]
+        pub chain_type: ::prost::alloc::string::String,
+        #[prost(string, tag = "2")]
+        pub path: ::prost::alloc::string::String,
+        #[prost(string, tag = "3")]
+        pub network: ::prost::alloc::string::String,
+        #[prost(string, tag = "4")]
+        pub seg_wit: ::prost::alloc::string::String,
+        #[prost(string, tag = "5")]
+        pub chain_id: ::prost::alloc::string::String,
+        #[prost(string, tag = "6")]
+        pub curve: ::prost::alloc::string::String,
+        #[prost(string, tag = "7")]
+        pub bech32_prefix: ::prost::alloc::string::String,
+    }
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccountResponse {
+    #[prost(string, tag = "1")]
+    pub chain_type: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub address: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub path: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub public_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "6")]
+    pub extended_public_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "7")]
+    pub encrypted_extended_public_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "8")]
+    pub seg_wit: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeriveAccountsResult {
+    #[prost(message, repeated, tag = "1")]
+    pub accounts: ::prost::alloc::vec::Vec<AccountResponse>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeriveSubAccountsParam {
+    #[prost(string, tag = "1")]
+    pub chain_type: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub network: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub seg_wit: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "5")]
+    pub relative_paths: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, tag = "6")]
+    pub extended_public_key: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeriveSubAccountsResult {
+    #[prost(message, repeated, tag = "1")]
+    pub accounts: ::prost::alloc::vec::Vec<AccountResponse>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetExtendedPublicKeysParam {
+    #[prost(message, repeated, tag = "1")]
+    pub derivations: ::prost::alloc::vec::Vec<PublicKeyDerivation>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetExtendedPublicKeysResult {
+    #[prost(string, repeated, tag = "1")]
+    pub extended_public_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PublicKeyDerivation {
+    #[prost(string, tag = "1")]
+    pub chain_type: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub path: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub curve: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetPublicKeysParam {
+    #[prost(message, repeated, tag = "1")]
+    pub derivations: ::prost::alloc::vec::Vec<PublicKeyDerivation>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetPublicKeysResult {
+    #[prost(string, repeated, tag = "1")]
+    pub public_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
diff --git a/imkey-core/ikc/src/bch_address.rs b/imkey-core/ikc/src/bch_address.rs
index 23031d18..ecc8de29 100644
--- a/imkey-core/ikc/src/bch_address.rs
+++ b/imkey-core/ikc/src/bch_address.rs
@@ -1,19 +1,15 @@
 use crate::api::{AddressParam, BtcForkWallet};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
-use bitcoin::Network;
 use coin_bch::address::BchAddress;
 use coin_btc_fork::address::BtcForkAddress;
+use ikc_common::path::get_account_path;
+use ikc_common::utility::network_convert;
 
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-
+    let network = network_convert(param.network.as_ref());
     let address = BchAddress::get_address(network, &param.path)?;
-    let account_path = ikc_common::utility::get_account_path(&param.path)?;
+    let account_path = get_account_path(&param.path)?;
     let enc_xpub = BtcForkAddress::get_enc_xpub(network, &account_path)?;
 
     let address_message = BtcForkWallet {
@@ -28,9 +24,7 @@ pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
 
 #[cfg(test)]
 mod tests {
-    use crate::api::{
-        AddressParam, AddressResult, BitcoinWallet, ExternalAddress, ExternalAddressParam,
-    };
+    use crate::api::AddressParam;
     use crate::bch_address::get_address;
     use ikc_device::device_binding::bind_test;
 
diff --git a/imkey-core/ikc/src/bch_signer.rs b/imkey-core/ikc/src/bch_signer.rs
index 64436b0e..5bef7168 100644
--- a/imkey-core/ikc/src/bch_signer.rs
+++ b/imkey-core/ikc/src/bch_signer.rs
@@ -1,10 +1,8 @@
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use bitcoin::Network;
-
 use coin_bch::transaction::{BchTransaction, Utxo};
 use coin_btc_fork::btcforkapi::{BtcForkTxInput, BtcForkTxOutput};
-use ikc_common::utility::hex_to_bytes;
 use ikc_common::SignParam;
 use prost::Message;
 
@@ -61,8 +59,7 @@ pub fn sign_bch_transaction(param: &BtcForkTxInput, sign_param: &SignParam) -> R
 #[cfg(test)]
 mod tests {
     use crate::bch_signer::sign_bch_transaction;
-    use coin_bch::transaction::BchTransaction;
-    use coin_btc_fork::btcforkapi::{BtcForkTxInput, BtcForkTxOutput, Utxo};
+    use coin_btc_fork::btcforkapi::{BtcForkTxInput, Utxo};
     use ikc_common::SignParam;
     use ikc_device::device_binding::bind_test;
 
@@ -81,7 +78,7 @@ mod tests {
         };
         let mut utxos = Vec::new();
         utxos.push(utxo);
-        let txInput = BtcForkTxInput {
+        let tx_input = BtcForkTxInput {
             to: "qq40fskqshxem2gvz0xkf34ww3h6zwv4dcr7pm0z6s".to_string(),
             amount: 93454,
             fee: 6000,
@@ -102,7 +99,7 @@ mod tests {
             fee: "".to_string(),
         };
 
-        let message = sign_bch_transaction(&txInput, &sign_param);
+        let message = sign_bch_transaction(&tx_input, &sign_param);
         assert_eq!("0afe0230313030303030303031653239383661303034363330636234353139323164396537623434353461363637316535306464643433656134333163333466363031316439636134633330393030303030303030366134373330343430323230363965643765623335353132616337636438393763386631306161656634666231666262656333356661343438653235346263626163646132623631343630393032323030336564653965383465383430386238643431306230613838656465656564383934623033393631623731353061663038626430653231636331313162633037343132313032353134393264666232393966323165343236333037313830623537376639323736393662366466306236313838333231356638386562393638356433643434396666666666666666303130653664303130303030303030303030313937366139313432616634633263303835636439646139306331336364363463366165373436666131333939353665383861633030303030303030124061333938363265343638353138306564366532633231613532643561643138376431346163363766343335616636313134343037663966366335666366383436", hex::encode(message.unwrap()));
     }
 }
diff --git a/imkey-core/ikc/src/btc_address.rs b/imkey-core/ikc/src/btc_address.rs
index 4e442fee..7c92553c 100644
--- a/imkey-core/ikc/src/btc_address.rs
+++ b/imkey-core/ikc/src/btc_address.rs
@@ -5,31 +5,11 @@ use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use bitcoin::network::constants::Network;
 use coin_bitcoin::address::BtcAddress;
-use coin_bitcoin::btcapi::{BtcXpubReq, BtcXpubRes};
+use ikc_common::utility::network_convert;
 use prost::Message;
 
-pub fn get_btc_xpub(data: &[u8]) -> Result<Vec<u8>> {
-    let input: BtcXpubReq = BtcXpubReq::decode(data).expect("imkey_illegal_param");
-
-    let network = match input.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-
-    let xpub = BtcAddress::get_xpub(network, input.path.as_ref())?;
-
-    let address_message = BtcXpubRes { xpub };
-    encode_message(address_message)
-}
-
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-
+    let network = network_convert(param.network.as_ref());
     let account_path = param.path.to_string();
     let main_address: String;
     let receive_address: String;
@@ -64,12 +44,7 @@ pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
 }
 
 pub fn calc_external_address(param: &ExternalAddressParam) -> Result<Vec<u8>> {
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-
+    let network = network_convert(param.network.as_ref());
     let account_path = param.path.to_string();
     let external_path = format!("{}/0/{}", account_path, param.external_idx);
     let receive_address: String;
@@ -108,14 +83,8 @@ pub fn register_btc_address(param: &AddressParam) -> Result<Vec<u8>> {
 }
 
 pub fn display_btc_legacy_address(param: &AddressParam) -> Result<Vec<u8>> {
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-
-    let path = format!("{}/0/0", param.path);
-    let address = BtcAddress::display_address(network, &path)?;
+    let network = network_convert(param.network.as_ref());
+    let address = BtcAddress::display_address(network, &param.path)?;
 
     let address_message = AddressResult {
         address,
@@ -126,12 +95,19 @@ pub fn display_btc_legacy_address(param: &AddressParam) -> Result<Vec<u8>> {
 }
 
 pub fn display_segwit_address(param: &AddressParam) -> Result<Vec<u8>> {
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
+    let network = network_convert(param.network.as_ref());
+    let address = BtcAddress::display_segwit_address(network, &param.path)?;
+
+    let address_message = AddressResult {
+        path: param.path.to_string(),
+        chain_type: param.chain_type.to_string(),
+        address,
     };
+    encode_message(address_message)
+}
 
+pub fn derive_account(param: &AddressParam) -> Result<Vec<u8>> {
+    let network = network_convert(param.network.as_ref());
     let path = format!("{}/0/0", param.path);
     let address = BtcAddress::display_segwit_address(network, &path)?;
 
diff --git a/imkey-core/ikc/src/btc_fork_address.rs b/imkey-core/ikc/src/btc_fork_address.rs
index 3f81abb5..bc2f7407 100644
--- a/imkey-core/ikc/src/btc_fork_address.rs
+++ b/imkey-core/ikc/src/btc_fork_address.rs
@@ -1,9 +1,10 @@
 use crate::api::{AddressParam, BtcForkWallet};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
-use bitcoin::Network;
 use coin_btc_fork::address::BtcForkAddress;
 use coin_btc_fork::btc_fork_network::network_from_param;
+use ikc_common::path::get_account_path;
+use ikc_common::utility::network_convert;
 
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let address: String;
@@ -18,18 +19,14 @@ pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
         address = BtcForkAddress::p2pkh(&network, &param.path)?;
     }
 
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-    let account_path = ikc_common::utility::get_account_path(&param.path)?;
+    let network = network_convert(param.network.as_ref());
+    let account_path = get_account_path(&param.path)?;
     let enc_xpub = BtcForkAddress::get_enc_xpub(network, &account_path)?;
 
     let address_message = BtcForkWallet {
         path: param.path.to_owned(),
         chain_type: param.chain_type.to_string(),
-        address: address,
+        address,
         enc_x_pub: enc_xpub,
     };
 
diff --git a/imkey-core/ikc/src/btc_signer.rs b/imkey-core/ikc/src/btc_signer.rs
index 2ff5c072..5296b3cf 100644
--- a/imkey-core/ikc/src/btc_signer.rs
+++ b/imkey-core/ikc/src/btc_signer.rs
@@ -12,7 +12,7 @@ use std::str::FromStr;
 pub fn sign_btc_transaction(data: &[u8], sign_param: &SignParam) -> Result<Vec<u8>> {
     let input: BtcTxInput = BtcTxInput::decode(data).expect("BtcTxInput");
 
-    if (input.protocol.to_uppercase() == "OMNI") {
+    if input.protocol.to_uppercase() == "OMNI" {
         if input.seg_wit.to_uppercase() == "P2WPKH" {
             sign_usdt_segwit_transaction(&input, sign_param)
         } else {
diff --git a/imkey-core/ikc/src/cosmos_address.rs b/imkey-core/ikc/src/cosmos_address.rs
index 9dfd9cdb..0fc23817 100644
--- a/imkey-core/ikc/src/cosmos_address.rs
+++ b/imkey-core/ikc/src/cosmos_address.rs
@@ -1,10 +1,8 @@
+use crate::api::{AddressParam, AddressResult, PubKeyParam, PubKeyResult};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use coin_cosmos::address::CosmosAddress;
 
-use crate::api::{AddressParam, AddressResult, PubKeyParam, PubKeyResult};
-use prost::Message;
-
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let address = CosmosAddress::get_address(&param.path)?;
     let address_message = AddressResult {
diff --git a/imkey-core/ikc/src/device_manager.rs b/imkey-core/ikc/src/device_manager.rs
index eee1d083..0d20631c 100644
--- a/imkey-core/ikc/src/device_manager.rs
+++ b/imkey-core/ikc/src/device_manager.rs
@@ -42,10 +42,10 @@ pub fn app_download(data: &[u8]) -> Result<Vec<u8>> {
     let request: AppDownloadReq = AppDownloadReq::decode(data).expect("imkey_illegal_param");
     let response = device_manager::app_download(request.app_name.as_ref())?;
 
-    let app_download_res = match response._ReturnData.address_register_list.is_some() {
+    let app_download_res = match response.return_data.address_register_list.is_some() {
         true => {
             let mut app_name_list = vec![];
-            for instance_aid in response._ReturnData.address_register_list.unwrap() {
+            for instance_aid in response.return_data.address_register_list.unwrap() {
                 app_name_list.push(
                     applet::get_appname_by_instid(instance_aid.as_str())
                         .expect("imKey_app_id_noe_exist")
@@ -67,10 +67,10 @@ pub fn app_download(data: &[u8]) -> Result<Vec<u8>> {
 pub fn app_update(data: &[u8]) -> Result<Vec<u8>> {
     let request: AppUpdateReq = AppUpdateReq::decode(data).expect("imkey_illegal_prarm");
     let response = device_manager::app_update(request.app_name.as_ref())?;
-    let app_update_res = match response._ReturnData.address_register_list.is_some() {
+    let app_update_res = match response.return_data.address_register_list.is_some() {
         true => {
             let mut app_name_list = vec![];
-            for instance_aid in response._ReturnData.address_register_list.unwrap() {
+            for instance_aid in response.return_data.address_register_list.unwrap() {
                 app_name_list.push(
                     applet::get_appname_by_instid(instance_aid.as_str())
                         .expect("imKey_app_id_noe_exist")
@@ -108,7 +108,7 @@ pub fn check_update() -> Result<Vec<u8>> {
     let response = device_manager::check_update()?;
 
     let mut available_bean_list: Vec<AvailableAppBean> = Vec::new();
-    for value in response._ReturnData.available_app_bean_list.unwrap() {
+    for value in response.return_data.available_app_bean_list.unwrap() {
         let version = match value.installed_version.as_ref() {
             Some(version) => version,
             None => "none",
@@ -128,17 +128,17 @@ pub fn check_update() -> Result<Vec<u8>> {
         });
     }
 
-    let return_code = response._ReturnCode;
+    let return_code = response.return_code;
     let mut status = constants::IMKEY_DEV_STATUS_LATEST;
     if return_code == constants::TSM_RETURNCODE_DEV_INACTIVATED.to_string() {
         status = constants::IMKEY_DEV_STATUS_INACTIVATED;
     }
 
     let response_msg = CheckUpdateRes {
-        se_id: response._ReturnData.seid.unwrap(),
-        sn: response._ReturnData.sn.unwrap(),
+        se_id: response.return_data.seid.unwrap(),
+        sn: response.return_data.sn.unwrap(),
         status: status.to_string(),
-        sdk_mode: response._ReturnData.sdk_mode.unwrap(),
+        sdk_mode: response.return_data.sdk_mode.unwrap(),
         available_app_list: available_bean_list,
     };
     encode_message(response_msg)
@@ -279,15 +279,15 @@ pub fn cos_check_update() -> Result<Vec<u8>> {
     let cos_check_update = device_manager::cos_check_update()?;
 
     encode_message(CosCheckUpdateRes {
-        seid: cos_check_update._ReturnData.seid,
-        is_latest: cos_check_update._ReturnData.is_latest,
+        seid: cos_check_update.return_data.seid,
+        is_latest: cos_check_update.return_data.is_latest,
         latest_cos_version: cos_check_update
-            ._ReturnData
+            .return_data
             .latest_cos_version
             .unwrap_or_default(),
-        update_type: cos_check_update._ReturnData.update_type.unwrap_or_default(),
-        description: cos_check_update._ReturnData.description.unwrap_or_default(),
-        is_update_success: cos_check_update._ReturnData.is_update_success,
+        update_type: cos_check_update.return_data.update_type.unwrap_or_default(),
+        description: cos_check_update.return_data.description.unwrap_or_default(),
+        is_update_success: cos_check_update.return_data.is_update_success,
     })
 }
 
diff --git a/imkey-core/ikc/src/eos_pubkey.rs b/imkey-core/ikc/src/eos_pubkey.rs
index d2488882..c25ff729 100644
--- a/imkey-core/ikc/src/eos_pubkey.rs
+++ b/imkey-core/ikc/src/eos_pubkey.rs
@@ -1,9 +1,8 @@
 use crate::api::eos_wallet::PubKeyInfo;
-use crate::api::{EosWallet, PubKeyParam, PubKeyResult};
+use crate::api::{EosWallet, PubKeyParam};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use coin_eos::pubkey::EosPubkey;
-use prost::Message;
 
 pub fn display_eos_pubkey(param: &PubKeyParam) -> Result<Vec<u8>> {
     let eos_pubkey = EosPubkey::display_pubkey(&param.path)?;
diff --git a/imkey-core/ikc/src/error_handling.rs b/imkey-core/ikc/src/error_handling.rs
index 31e00533..7261212a 100644
--- a/imkey-core/ikc/src/error_handling.rs
+++ b/imkey-core/ikc/src/error_handling.rs
@@ -1,23 +1,16 @@
+use anyhow::{anyhow, Error};
 use core::result;
-use failure::{Backtrace, Error};
 use std::{cell::RefCell, panic};
 
 pub type Result<T> = result::Result<T, Error>;
 
 thread_local! {
     pub static LAST_ERROR: RefCell<Option<Error>> = RefCell::new(None);
-    pub static LAST_BACKTRACE: RefCell<Option<(Option<String>, Backtrace)>> = RefCell::new(None);
 }
 
-#[cfg_attr(tarpaulin, skip)]
 #[allow(irrefutable_let_patterns)]
 fn notify_err(err: Error) -> Error {
-    if let _backtrace = err.backtrace() {
-        LAST_BACKTRACE.with(|e| {
-            *e.borrow_mut() = Some((None, Backtrace::new()));
-        });
-    }
-    let display_err = format_err!("{}", &err);
+    let display_err = anyhow!("{}", &err);
     LAST_ERROR.with(|e| {
         *e.borrow_mut() = Some(err);
     });
@@ -39,7 +32,7 @@ pub unsafe fn landingpad<F: FnOnce() -> Result<T> + panic::UnwindSafe, T>(f: F)
                     None => "Box<Any>",
                 },
             };
-            Err(notify_err(format_err!("{}", msg)))
+            Err(notify_err(anyhow!("{}", msg)))
         }
     }
 }
diff --git a/imkey-core/ikc/src/ethereum_address.rs b/imkey-core/ikc/src/ethereum_address.rs
index 96993a74..4194f0fe 100644
--- a/imkey-core/ikc/src/ethereum_address.rs
+++ b/imkey-core/ikc/src/ethereum_address.rs
@@ -1,10 +1,8 @@
+use crate::api::{AddressParam, AddressResult};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use coin_ethereum::address::EthAddress;
 
-use crate::api::{AddressParam, AddressResult};
-use prost::Message;
-
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let address = EthAddress::get_address(&param.path)?;
     let address_message = AddressResult {
diff --git a/imkey-core/ikc/src/ethereum_signer.rs b/imkey-core/ikc/src/ethereum_signer.rs
index f5df84bf..1d9fc495 100644
--- a/imkey-core/ikc/src/ethereum_signer.rs
+++ b/imkey-core/ikc/src/ethereum_signer.rs
@@ -1,9 +1,10 @@
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
+use anyhow::anyhow;
 use coin_ethereum::ethapi::{EthMessageInput, EthTxInput};
 use coin_ethereum::transaction::{AccessListItem, Transaction};
 use coin_ethereum::types::Action;
-use ethereum_types::{Address, H256, U256, U64};
+use ethereum_types::{Address, H256, U256};
 use hex;
 use ikc_common::constants::ETH_TRANSACTION_TYPE_EIP1559;
 use ikc_common::SignParam;
@@ -18,10 +19,13 @@ pub fn sign_eth_transaction(data: &[u8], sign_param: &SignParam) -> Result<Vec<u
         hex::decode(&input.data).unwrap()
     };
 
-    let mut to = input.to;
-    if to.starts_with("0x") {
-        to = to[2..].to_string();
-    }
+    let to = if input.to.is_empty() || input.to == "0x" {
+        "0000000000000000000000000000000000000000"
+    } else if input.to.starts_with("0x") {
+        &input.to[2..]
+    } else {
+        &input.to
+    };
 
     let eth_tx = if input.r#type.to_lowercase() == "0x02"
         || input.r#type.to_lowercase() == "0x2"
@@ -40,7 +44,7 @@ pub fn sign_eth_transaction(data: &[u8], sign_param: &SignParam) -> Result<Vec<u
             access_list: {
                 let mut access_list: Vec<AccessListItem> = Vec::new();
                 for access in input.access_list {
-                    let mut item = AccessListItem {
+                    let item = AccessListItem {
                         address: Address::from_str(remove_0x(&access.address)).unwrap(),
                         storage_keys: {
                             let mut storage_keys: Vec<H256> = Vec::new();
@@ -74,7 +78,7 @@ pub fn sign_eth_transaction(data: &[u8], sign_param: &SignParam) -> Result<Vec<u
     let chain_id_parsed = input.chain_id.parse::<u64>();
     let chain_id = match chain_id_parsed {
         Ok(id) => id,
-        Err(error) => {
+        Err(_error) => {
             if input.chain_id.to_lowercase().starts_with("0x") {
                 let without_prefix = &input.chain_id.trim_start_matches("0x");
                 u64::from_str_radix(without_prefix, 16).unwrap()
@@ -97,10 +101,9 @@ pub fn sign_eth_transaction(data: &[u8], sign_param: &SignParam) -> Result<Vec<u
 
 fn parse_eth_argument(str: &str) -> Result<U256> {
     if str.to_lowercase().starts_with("0x") {
-        U256::from_str(&str[2..].to_string())
-            .map_err(|_err| format_err!("unpack eth argument error"))
+        U256::from_str(&str[2..].to_string()).map_err(|_err| anyhow!("unpack eth argument error"))
     } else {
-        U256::from_dec_str(str).map_err(|_err| format_err!("unpack eth argument dec error"))
+        U256::from_dec_str(str).map_err(|_err| anyhow!("unpack eth argument dec error"))
     }
 }
 
@@ -123,11 +126,11 @@ mod tests {
     use super::*;
     use crate::ethereum_signer::sign_eth_transaction;
     use coin_ethereum::ethapi::{AccessList, EthTxInput, EthTxOutput};
-    use ethereum_types::{Address, U256};
+    use ethereum_types::U256;
     use hex;
     use ikc_common::constants;
-    use ikc_device::device_binding::{bind_test, DeviceManage};
-    use ikc_transport::hid_api::hid_connect;
+    use ikc_device::device_binding::bind_test;
+
     use std::str::FromStr;
 
     #[test]
@@ -151,7 +154,7 @@ mod tests {
             sender: "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string(),
             fee: "0.001316 ETH".to_string(),
         };
-        let x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
+        let _x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
         println!("sign");
     }
 
@@ -170,7 +173,7 @@ mod tests {
             sender: "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string(),
             fee: "0.001316 ETH".to_string(),
         };
-        let x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
+        let _x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
         println!("sign");
     }
 
@@ -189,7 +192,7 @@ mod tests {
             sender: "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string(),
             fee: "0.001316 ETH".to_string(),
         };
-        let x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
+        let _x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
         println!("sign");
     }
 
@@ -208,7 +211,7 @@ mod tests {
             sender: "0x6031564e7b2F5cc33737807b2E58DaFF870B590b".to_string(),
             fee: "0.001316 ETH".to_string(),
         };
-        let x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
+        let _x = sign_eth_transaction(data.as_slice(), &sign_param).unwrap();
         println!("sign");
     }
 
diff --git a/imkey-core/ikc/src/filecoin_address.rs b/imkey-core/ikc/src/filecoin_address.rs
index 3aaa903b..eff8d92c 100644
--- a/imkey-core/ikc/src/filecoin_address.rs
+++ b/imkey-core/ikc/src/filecoin_address.rs
@@ -2,7 +2,6 @@ use crate::api::{AddressParam, AddressResult};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use coin_filecoin::address::FilecoinAddress;
-use prost::Message;
 
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let address = FilecoinAddress::get_address(param.path.as_ref(), param.network.as_ref())?;
diff --git a/imkey-core/ikc/src/handler.rs b/imkey-core/ikc/src/handler.rs
new file mode 100644
index 00000000..d4fb7102
--- /dev/null
+++ b/imkey-core/ikc/src/handler.rs
@@ -0,0 +1,345 @@
+use crate::api::{
+    AccountResponse, DeriveAccountsParam, DeriveAccountsResult, DeriveSubAccountsParam,
+    DeriveSubAccountsResult, GetExtendedPublicKeysParam, GetExtendedPublicKeysResult,
+    GetPublicKeysParam, GetPublicKeysResult,
+};
+use crate::message_handler::encode_message;
+use crate::Result;
+use anyhow::anyhow;
+use bitcoin::hashes::hex::ToHex;
+use bitcoin::util::bip32::ExtendedPubKey;
+use bitcoin::Network;
+use coin_bch::address::BchAddress;
+use coin_bitcoin::address::BtcAddress;
+use coin_btc_fork::address::BtcForkAddress;
+use coin_btc_fork::btc_fork_network::network_from_param;
+use coin_ckb::address::CkbAddress;
+use coin_cosmos::address::CosmosAddress;
+use coin_eos::pubkey;
+use coin_eos::pubkey::EosPubkey;
+use coin_ethereum::address::EthAddress;
+use coin_filecoin::address::FilecoinAddress;
+use coin_substrate::address::{AddressType, SubstrateAddress};
+use coin_tron::address::TronAddress;
+use ikc_common::curve::CurveType;
+use ikc_common::path::get_account_path;
+use ikc_common::utility::{
+    encrypt_xpub, extended_pub_key_derive, from_ss58check_with_version, get_xpub_prefix,
+    hex_to_bytes, network_convert, to_ss58check_with_version, uncompress_pubkey_2_compress,
+};
+use prost::Message;
+use std::str::FromStr;
+
+pub(crate) fn derive_accounts(data: &[u8]) -> Result<Vec<u8>> {
+    let param: DeriveAccountsParam =
+        DeriveAccountsParam::decode(data).expect("derive_accounts param");
+    let mut account_responses = vec![];
+    for derivation in param.derivations {
+        let account_path = if "secp256k1".eq(&derivation.curve.to_lowercase()) {
+            get_account_path(&derivation.path)?
+        } else {
+            "".to_string()
+        };
+
+        let mut account_rsp = AccountResponse {
+            chain_type: derivation.chain_type.to_owned(),
+            path: derivation.path.to_owned(),
+            curve: derivation.curve,
+            seg_wit: derivation.seg_wit.to_owned(),
+            ..Default::default()
+        };
+
+        let ext_public_key = match derivation.chain_type.as_str() {
+            "BITCOIN" | "LITECOIN" => {
+                let network = network_convert(derivation.network.as_str());
+                let public_key = BtcAddress::get_pub_key(&derivation.path)?;
+                let public_key = uncompress_pubkey_2_compress(&public_key);
+                account_rsp.public_key = format!("0x{}", public_key);
+                let btc_fork_network = network_from_param(
+                    &derivation.chain_type,
+                    &derivation.network,
+                    &derivation.seg_wit,
+                )
+                .unwrap();
+                let address = match derivation.seg_wit.as_str() {
+                    "P2WPKH" => BtcForkAddress::p2shwpkh(&btc_fork_network, &derivation.path)?,
+                    _ => BtcForkAddress::p2pkh(&btc_fork_network, &derivation.path)?,
+                };
+                account_rsp.address = address;
+                BtcAddress::get_xpub(network, &account_path)?
+            }
+            "ETHEREUM" => {
+                let public_key = EthAddress::get_pub_key(&derivation.path)?;
+                let public_key = uncompress_pubkey_2_compress(&public_key[..130]);
+                account_rsp.public_key = format!("0x{}", public_key);
+                account_rsp.address = EthAddress::get_address(&derivation.path)?;
+                EthAddress::get_xpub(&account_path)?
+            }
+            "COSMOS" => {
+                let public_key = CosmosAddress::get_pub_key(&derivation.path)?;
+                let public_key = uncompress_pubkey_2_compress(&public_key[..130]);
+                account_rsp.public_key = format!("0x{}", public_key);
+                account_rsp.address = CosmosAddress::get_address(&derivation.path)?;
+                CosmosAddress::get_xpub(&account_path)?
+            }
+            "FILECOIN" => {
+                let public_key = FilecoinAddress::get_pub_key(&derivation.path)?;
+                let public_key = uncompress_pubkey_2_compress(&public_key[..130]);
+                account_rsp.public_key = format!("0x{}", public_key);
+                account_rsp.address =
+                    FilecoinAddress::get_address(&derivation.path, &derivation.network)?;
+                FilecoinAddress::get_xpub(&derivation.network, &account_path)?
+            }
+            "POLKADOT" | "KUSAMA" => {
+                let public_key = SubstrateAddress::get_public_key(
+                    &derivation.path,
+                    &AddressType::from_str(&derivation.chain_type)?,
+                )?;
+                account_rsp.public_key = format!("0x{}", public_key).to_lowercase();
+                account_rsp.address = SubstrateAddress::get_address(
+                    &derivation.path,
+                    &AddressType::from_str(&derivation.chain_type)?,
+                )?;
+                "".to_string()
+            }
+            "TRON" => {
+                let public_key = hex::encode(TronAddress::get_pub_key(&derivation.path)?);
+                let public_key = uncompress_pubkey_2_compress(&public_key[..130]);
+                account_rsp.public_key = format!("0x{}", public_key);
+                account_rsp.address = TronAddress::get_address(&derivation.path)?;
+                TronAddress::get_xpub(&account_path)?
+            }
+            "NERVOS" => {
+                let public_key = CkbAddress::get_public_key(&derivation.path)?;
+                let public_key = uncompress_pubkey_2_compress(&public_key);
+                account_rsp.public_key = format!("0x{}", public_key);
+                account_rsp.address =
+                    CkbAddress::get_address(&derivation.network, &derivation.path)?;
+                CkbAddress::get_xpub(&derivation.network, &account_path)?
+            }
+            "EOS" => {
+                account_rsp.public_key = EosPubkey::get_pubkey(&derivation.path)?;
+                account_rsp.address = "".to_string();
+                EosPubkey::get_xpub(&account_path)?
+            }
+            "BITCOINCASH" => {
+                let network = network_convert(derivation.network.as_str());
+                let public_key = BchAddress::get_pub_key(network, &derivation.path)?;
+                let public_key = uncompress_pubkey_2_compress(&public_key);
+                account_rsp.public_key = format!("0x{}", public_key);
+                account_rsp.address = BchAddress::get_address(network, &derivation.path)?;
+                BtcAddress::get_xpub(network, &account_path)?
+            }
+            _ => return Err(anyhow!("unsupported_chain_type")),
+        };
+
+        if !ext_public_key.is_empty() {
+            let extended_pub_key = ExtendedPubKey::from_str(&ext_public_key)?;
+            let ext_version = get_xpub_prefix(&derivation.network);
+            let ext_public_key = to_ss58check_with_version(extended_pub_key, &ext_version);
+            account_rsp.extended_public_key = ext_public_key.clone();
+            account_rsp.encrypted_extended_public_key = encrypt_xpub(&ext_public_key)?;
+        }
+        account_responses.push(account_rsp);
+    }
+
+    encode_message(DeriveAccountsResult {
+        accounts: account_responses,
+    })
+}
+
+pub(crate) fn derive_sub_accounts(data: &[u8]) -> Result<Vec<u8>> {
+    let param: DeriveSubAccountsParam =
+        DeriveSubAccountsParam::decode(data).expect("derive_accounts_param_error");
+    //get xpub
+    let curve = CurveType::from_str(&param.curve);
+    let xpub = match curve {
+        CurveType::SECP256k1 => from_ss58check_with_version(&param.extended_public_key)?,
+        _ => return Err(anyhow!("invalid_curve_type")),
+    };
+    let encrypted_extended_public_key = encrypt_xpub(&param.extended_public_key.to_string())?;
+    let mut account = AccountResponse {
+        chain_type: param.chain_type.to_owned(),
+        curve: param.curve,
+        extended_public_key: param.extended_public_key.to_owned(),
+        encrypted_extended_public_key,
+        seg_wit: param.seg_wit.to_owned(),
+        ..Default::default()
+    };
+    let mut account_responses = vec![];
+    for relative_path in param.relative_paths {
+        let ext_pub_key = extended_pub_key_derive(&xpub.0, &relative_path)?;
+        let pub_key_uncompressed = ext_pub_key.public_key.serialize_uncompressed().to_vec();
+        account.public_key = format!("0x{}", ext_pub_key.public_key.serialize().to_hex());
+        account.path = relative_path;
+        let address = match param.chain_type.as_str() {
+            "ETHEREUM" => EthAddress::from_pub_key(pub_key_uncompressed)?,
+            "BITCOIN" | "LITECOIN" => {
+                let btc_fork_network =
+                    network_from_param(&param.chain_type, &param.network, &param.seg_wit);
+                if btc_fork_network.is_none() {
+                    return Err(anyhow!("get_btc_fork_network_is_null"));
+                }
+                BtcForkAddress::from_pub_key(pub_key_uncompressed, btc_fork_network.unwrap())?
+            }
+            "COSMOS" => CosmosAddress::from_pub_key(pub_key_uncompressed)?,
+            "FILECOIN" => FilecoinAddress::from_pub_key(pub_key_uncompressed, &param.network)?,
+            "TRON" => TronAddress::from_pub_key(&pub_key_uncompressed)?,
+            "NERVOS" => CkbAddress::from_public_key(&param.network, &pub_key_uncompressed)?,
+            "EOS" => EosPubkey::from_pub_key(&pub_key_uncompressed)?,
+            "BITCOINCASH" => BchAddress::from_pub_key(&pub_key_uncompressed, &param.network)?,
+            _ => return Err(anyhow!("unsupported_chain_type")),
+        };
+        account.address = address;
+        account_responses.push(account.clone());
+    }
+
+    encode_message(DeriveSubAccountsResult {
+        accounts: account_responses,
+    })
+}
+
+pub(crate) fn get_extended_public_keys(data: &[u8]) -> Result<Vec<u8>> {
+    let param: GetExtendedPublicKeysParam = GetExtendedPublicKeysParam::decode(data)?;
+    let mut extended_public_keys = vec![];
+    for public_key_derivation in param.derivations.iter() {
+        // if "".eq(&public_key_derivation.path) || &public_key_derivation.path.split("/") {  }
+        if !public_key_derivation.curve.eq("secp256k1") {
+            return Err(anyhow!("unsupported_curve_type"));
+        }
+        let extended_public_key = match public_key_derivation.chain_type.as_str() {
+            "BITCOIN" | "LITECOIN" | "BITCOINCASH" => {
+                BtcAddress::get_xpub(Network::Bitcoin, public_key_derivation.path.as_str())?
+            }
+            "ETHEREUM" => EthAddress::get_xpub(public_key_derivation.path.as_str())?,
+            "COSMOS" => CosmosAddress::get_xpub(public_key_derivation.path.as_str())?,
+            "FILECOIN" => {
+                FilecoinAddress::get_xpub("MAINNET", public_key_derivation.path.as_str())?
+            }
+            "TRON" => TronAddress::get_xpub(public_key_derivation.path.as_str())?,
+            "EOS" => EosPubkey::get_xpub(public_key_derivation.path.as_str())?,
+            "NERVOS" => CkbAddress::get_xpub("MAINNET", public_key_derivation.path.as_str())?,
+            _ => return Err(anyhow!("unsupported_chain_type")),
+        };
+        extended_public_keys.push(extended_public_key);
+    }
+    encode_message(GetExtendedPublicKeysResult {
+        extended_public_keys,
+    })
+}
+
+pub(crate) fn get_public_keys(data: &[u8]) -> Result<Vec<u8>> {
+    let param: GetPublicKeysParam = GetPublicKeysParam::decode(data)?;
+    let mut public_keys = vec![];
+    for public_key_derivation in param.derivations.iter() {
+        let public_key = match public_key_derivation.curve.as_str() {
+            "secp256k1" => {
+                let mut public_key = match public_key_derivation.chain_type.as_str() {
+                    "BITCOIN" | "LITECOIN" | "BITCOINCASH" => {
+                        BtcAddress::get_pub_key(&public_key_derivation.path)?
+                    }
+
+                    "ETHEREUM" => {
+                        EthAddress::get_pub_key(&public_key_derivation.path)?[..130].to_string()
+                    }
+                    "COSMOS" => {
+                        CosmosAddress::get_pub_key(&public_key_derivation.path)?[..130].to_string()
+                    }
+                    "FILECOIN" => FilecoinAddress::get_pub_key(&public_key_derivation.path)?[..130]
+                        .to_string(),
+                    "TRON" => hex::encode(TronAddress::get_pub_key(&public_key_derivation.path)?)
+                        [..130]
+                        .to_string(),
+                    "EOS" => EosPubkey::get_pubkey(&public_key_derivation.path)?,
+                    "NERVOS" => CkbAddress::get_public_key(&public_key_derivation.path)?,
+                    _ => return Err(anyhow!("unsupported_chain_type")),
+                };
+
+                if !"EOS".eq(&public_key_derivation.chain_type) {
+                    public_key = uncompress_pubkey_2_compress(&public_key);
+                }
+
+                if !public_key.starts_with("0x") && !"EOS".eq(&public_key_derivation.chain_type) {
+                    public_key = format!("0x{}", public_key);
+                };
+                public_key
+            }
+            "ed25519" => {
+                let mut public_key = match public_key_derivation.chain_type.as_str() {
+                    "POLKADOT" | "KUSAMA" => SubstrateAddress::get_public_key(
+                        &public_key_derivation.path,
+                        &AddressType::from_str(&public_key_derivation.chain_type)?,
+                    )?,
+                    _ => return Err(anyhow!("unsupported_chain_type")),
+                };
+
+                if !public_key.starts_with("0x") {
+                    public_key = format!("0x{}", public_key);
+                };
+                public_key
+            }
+            _ => return Err(anyhow!("unsupported_curve_type")),
+        };
+        public_keys.push(public_key);
+    }
+
+    encode_message(GetPublicKeysResult { public_keys })
+}
+
+#[cfg(test)]
+mod test {
+    use crate::api::derive_accounts_param::Derivation;
+    use crate::api::{DeriveAccountsParam, DeriveSubAccountsParam};
+    use crate::handler::{derive_accounts, derive_sub_accounts};
+    use crate::message_handler::encode_message;
+
+    #[test]
+    fn test_derive_accounts_exception() {
+        let derivations = vec![Derivation {
+            chain_type: "TEZOS".to_string(),
+            path: "".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "ed25519".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam { derivations };
+        let response = derive_accounts(&encode_message(param).unwrap());
+        assert!(response.is_err());
+        assert_eq!(
+            response.err().unwrap().to_string(),
+            "unsupported_chain_type"
+        );
+    }
+
+    #[test]
+    fn test_derive_sub_accounts_exception() {
+        let param = DeriveSubAccountsParam {
+            chain_type: "POLKADOT".to_string(),
+            curve: "ed25519".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string()],
+            extended_public_key: "".to_string(),
+        };
+        let response = derive_sub_accounts(&encode_message(param).unwrap());
+        assert!(response.is_err());
+        assert_eq!(response.err().unwrap().to_string(), "invalid_curve_type");
+
+        let param = DeriveSubAccountsParam{
+            chain_type: "POLKADOT".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string()],
+            extended_public_key: "xpub6Boii2KSAfEv7EhbBuopXKB2Gshi8kMpTGWyHuY9BHwYA8qPeu7ZYdnnXCuUdednhwyjyK2Z8gJD2AfawgBHp3Kkf2GjBjzEQAyJ3uJ4SuG".to_string(),
+        };
+        let response = derive_sub_accounts(&encode_message(param).unwrap());
+        assert!(response.is_err());
+        assert_eq!(
+            response.err().unwrap().to_string(),
+            "unsupported_chain_type"
+        );
+    }
+}
diff --git a/imkey-core/ikc/src/ikc.rs b/imkey-core/ikc/src/ikc.rs
deleted file mode 100644
index 795441e0..00000000
--- a/imkey-core/ikc/src/ikc.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-/// Action Wrapper
-/// There is a `call_imkey_api` method in tcx which act as a endpoint like RPC. It accepts a `ImkeyAction` param which method field is
-/// the real action and param field is the real param of that method.
-/// When an error occurred, the `call_imkey_api` will return a `Response` which isSuccess field be false and error field is the reason
-/// which cause the error.
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ImkeyAction {
-    #[prost(string, tag="1")]
-    pub method: std::string::String,
-    #[prost(message, optional, tag="2")]
-    pub param: ::std::option::Option<::prost_types::Any>,
-}
-/// A common response when error occurred.
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ErrorResponse {
-    #[prost(bool, tag="1")]
-    pub is_success: bool,
-    #[prost(string, tag="2")]
-    pub error: std::string::String,
-}
-///A commonresponse when successfully ended.
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CommonResponse {
-    #[prost(string, tag="1")]
-    pub result: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AddressParam {
-    #[prost(string, tag="1")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="2")]
-    pub path: std::string::String,
-    #[prost(string, tag="3")]
-    pub network: std::string::String,
-    #[prost(bool, tag="4")]
-    pub is_seg_wit: bool,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AddressResult {
-    #[prost(string, tag="1")]
-    pub path: std::string::String,
-    #[prost(string, tag="2")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="3")]
-    pub address: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PubKeyParam {
-    #[prost(string, tag="1")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="2")]
-    pub path: std::string::String,
-    #[prost(string, tag="3")]
-    pub network: std::string::String,
-    #[prost(string, tag="4")]
-    pub is_seg_wit: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PubKeyResult {
-    #[prost(string, tag="1")]
-    pub path: std::string::String,
-    #[prost(string, tag="2")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="3")]
-    pub pub_key: std::string::String,
-    #[prost(string, tag="4")]
-    pub derived_mode: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ExternalAddress {
-    #[prost(string, tag="1")]
-    pub address: std::string::String,
-    #[prost(string, tag="2")]
-    pub derived_path: std::string::String,
-    #[prost(string, tag="3")]
-    pub r#type: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BitcoinWallet {
-    #[prost(string, tag="1")]
-    pub path: std::string::String,
-    #[prost(string, tag="2")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="3")]
-    pub address: std::string::String,
-    #[prost(string, tag="4")]
-    pub enc_x_pub: std::string::String,
-    #[prost(message, optional, tag="5")]
-    pub external_address: ::std::option::Option<ExternalAddress>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct EosWallet {
-    #[prost(string, tag="1")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="2")]
-    pub address: std::string::String,
-    #[prost(message, repeated, tag="3")]
-    pub public_keys: ::std::vec::Vec<eos_wallet::PubKeyInfo>,
-}
-pub mod eos_wallet {
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct PubKeyInfo {
-        #[prost(string, tag="1")]
-        pub path: std::string::String,
-        #[prost(string, tag="2")]
-        pub derived_mode: std::string::String,
-        #[prost(string, tag="3")]
-        pub public_key: std::string::String,
-    }
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ExternalAddressParam {
-    #[prost(string, tag="1")]
-    pub path: std::string::String,
-    #[prost(string, tag="2")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="3")]
-    pub network: std::string::String,
-    #[prost(string, tag="4")]
-    pub seg_wit: std::string::String,
-    #[prost(int32, tag="5")]
-    pub external_idx: i32,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct InitImKeyCoreXParam {
-    #[prost(string, tag="1")]
-    pub file_dir: std::string::String,
-    #[prost(string, tag="2")]
-    pub xpub_common_key: std::string::String,
-    #[prost(string, tag="3")]
-    pub xpub_common_iv: std::string::String,
-    #[prost(bool, tag="4")]
-    pub is_debug: bool,
-    #[prost(string, tag="5")]
-    pub system: std::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BtcForkWallet {
-    #[prost(string, tag="1")]
-    pub path: std::string::String,
-    #[prost(string, tag="2")]
-    pub chain_type: std::string::String,
-    #[prost(string, tag="3")]
-    pub address: std::string::String,
-    #[prost(string, tag="4")]
-    pub enc_x_pub: std::string::String,
-}
diff --git a/imkey-core/ikc/src/lib.rs b/imkey-core/ikc/src/lib.rs
index 761b6b77..05db9b1c 100644
--- a/imkey-core/ikc/src/lib.rs
+++ b/imkey-core/ikc/src/lib.rs
@@ -1,5 +1,6 @@
 use crate::api::{AddressParam, ErrorResponse, ExternalAddressParam, ImkeyAction, PubKeyParam};
-use failure::Error;
+use anyhow::{anyhow, Error};
+use handler::derive_sub_accounts;
 use ikc_common::SignParam;
 use prost::Message;
 use std::ffi::{CStr, CString};
@@ -32,15 +33,15 @@ pub mod tron_address;
 pub mod tron_signer;
 
 use parking_lot::Mutex;
+mod handler;
 pub mod tezos_address;
 pub mod tezos_signer;
 
 #[macro_use]
 extern crate lazy_static;
-
-#[macro_use]
-extern crate failure;
-use crate::error_handling::{landingpad, LAST_BACKTRACE, LAST_ERROR};
+extern crate anyhow;
+use crate::error_handling::{landingpad, LAST_ERROR};
+use crate::handler::{derive_accounts, get_extended_public_keys, get_public_keys};
 use crate::message_handler::encode_message;
 use ikc_transport::message;
 
@@ -57,7 +58,9 @@ pub extern "C" fn get_apdu() -> *const c_char {
 
 #[no_mangle]
 pub extern "C" fn set_apdu(apdu: *const c_char) {
-    message::set_apdu(apdu);
+    unsafe {
+        message::set_apdu(unsafe { apdu });
+    }
 }
 
 #[no_mangle]
@@ -67,7 +70,9 @@ pub extern "C" fn get_apdu_return() -> *const c_char {
 
 #[no_mangle]
 pub extern "C" fn set_apdu_return(apdu_return: *const c_char) {
-    message::set_apdu_return(apdu_return);
+    unsafe {
+        message::set_apdu_return(unsafe { apdu_return });
+    }
 }
 
 #[no_mangle]
@@ -82,7 +87,7 @@ pub unsafe extern "C" fn imkey_free_const_string(s: *const c_char) {
     if s.is_null() {
         return;
     }
-    CStr::from_ptr(s);
+    let _ = CStr::from_ptr(s);
 }
 
 /// dispatch protobuf rpc call
@@ -144,27 +149,18 @@ pub unsafe extern "C" fn call_imkey_api(hex_str: *const c_char) -> *const c_char
                 "TEZOS" => tezos_address::get_address(&param),
                 "BITCOINCASH" => bch_address::get_address(&param),
                 "LITECOIN" => btc_fork_address::get_address(&param),
-                _ => Err(format_err!("get_address unsupported_chain")),
-            }
-        }),
-
-        "get_pub_key" => landingpad(|| {
-            let param: PubKeyParam = PubKeyParam::decode(action.param.unwrap().value.as_slice())
-                .expect("imkey_illegal_param");
-            match param.chain_type.as_str() {
-                "EOS" => eos_pubkey::get_eos_pubkey(&param),
-                "TEZOS" => tezos_address::get_pub_key(&param),
-                "COSMOS" => cosmos_address::get_cosmos_pub_key(&param),
-                _ => Err(format_err!("get_pub_key unsupported_chain")),
+                _ => Err(anyhow!("get_address unsupported_chain")),
             }
         }),
-
+        "derive_accounts" => landingpad(|| derive_accounts(&action.param.unwrap().value)),
+        "derive_sub_accounts" => landingpad(|| derive_sub_accounts(&action.param.unwrap().value)),
+        "get_public_keys" => landingpad(|| get_public_keys(&action.param.unwrap().value)),
         "register_pub_key" => landingpad(|| {
             let param: PubKeyParam = PubKeyParam::decode(action.param.unwrap().value.as_slice())
                 .expect("imkey_illegal_param");
             match param.chain_type.as_str() {
                 "EOS" => eos_pubkey::display_eos_pubkey(&param),
-                _ => Err(format_err!("register_pub_key unsupported_chain")),
+                _ => Err(anyhow!("register_pub_key unsupported_chain")),
             }
         }),
 
@@ -181,7 +177,7 @@ pub unsafe extern "C" fn call_imkey_api(hex_str: *const c_char) -> *const c_char
                 "TRON" => tron_address::display_address(&param),
                 "NERVOS" => nervos_address::display_address(&param),
                 "TEZOS" => tezos_address::display_tezos_address(&param),
-                _ => Err(format_err!("register_address unsupported_chain")),
+                _ => Err(anyhow!("register_address unsupported_chain")),
             }
         }),
 
@@ -200,7 +196,7 @@ pub unsafe extern "C" fn call_imkey_api(hex_str: *const c_char) -> *const c_char
                     eos_signer::sign_eos_transaction(&param.clone().input.unwrap().value, &param)
                 }
                 "COSMOS" => cosmos_signer::sign_cosmos_transaction(
-                    &param.clone().clone().input.unwrap().value,
+                    &param.clone().input.unwrap().value,
                     &param,
                 ),
                 "FILECOIN" => filecoin_signer::sign_filecoin_transaction(
@@ -229,7 +225,7 @@ pub unsafe extern "C" fn call_imkey_api(hex_str: *const c_char) -> *const c_char
                 "LITECOIN" => {
                     btc_fork_signer::sign_transaction(&param.clone().input.unwrap().value, &param)
                 }
-                _ => Err(format_err!("sign_tx unsupported_chain")),
+                _ => Err(anyhow!("sign_tx unsupported_chain")),
             }
         }),
 
@@ -246,7 +242,7 @@ pub unsafe extern "C" fn call_imkey_api(hex_str: *const c_char) -> *const c_char
                     &param,
                 ),
                 "TRON" => tron_signer::sign_message(&param.clone().input.unwrap().value, &param),
-                _ => Err(format_err!(
+                _ => Err(anyhow!(
                     "sign message is not supported the chain {}",
                     param.chain_type
                 )),
@@ -260,13 +256,14 @@ pub unsafe extern "C" fn call_imkey_api(hex_str: *const c_char) -> *const c_char
                     .expect("calc external address unpack error");
             match param.chain_type.as_str() {
                 "BITCOIN" => btc_address::calc_external_address(&param),
-                _ => Err(format_err!("only support calc bitcoin external address")),
+                _ => Err(anyhow!("only support calc bitcoin external address")),
             }
         }),
 
-        "btc_get_xpub" => landingpad(|| btc_address::get_btc_xpub(&action.param.unwrap().value)),
-
-        _ => landingpad(|| Err(format_err!("unsupported_method"))),
+        "get_extended_public_keys" => {
+            landingpad(|| get_extended_public_keys(&action.param.unwrap().value))
+        }
+        _ => landingpad(|| Err(anyhow!("unsupported_method"))),
     };
     match reply {
         Ok(reply) => {
@@ -282,9 +279,6 @@ pub unsafe extern "C" fn imkey_clear_err() {
     LAST_ERROR.with(|e| {
         *e.borrow_mut() = None;
     });
-    LAST_BACKTRACE.with(|e| {
-        *e.borrow_mut() = None;
-    });
 }
 
 #[no_mangle]
@@ -307,20 +301,18 @@ pub unsafe extern "C" fn imkey_get_last_err_message() -> *const c_char {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use error_handling::Result;
-    use std::ffi::{CStr, CString};
-    use std::fs::remove_file;
-    use std::os::raw::c_char;
-    use std::panic;
-    use std::path::Path;
-
-    use prost::Message;
+    use crate::api::derive_accounts_param::Derivation;
+    use crate::api::{
+        DeriveAccountsParam, DeriveAccountsResult, DeriveSubAccountsParam, DeriveSubAccountsResult,
+        GetExtendedPublicKeysParam, GetExtendedPublicKeysResult, GetPublicKeysParam,
+        GetPublicKeysResult, PublicKeyDerivation,
+    };
 
-    use crate::api::CommonResponse;
-    use ikc_device::device_binding::DeviceManage;
-    use ikc_device::deviceapi::{AppDownloadReq, BindAcquireReq};
+    use ikc_device::deviceapi::{BindAcquireReq, BindCheckRes};
     use ikc_transport::hid_api::hid_connect;
-    use std::fs;
+    use prost::Message;
+    use std::ffi::{CStr, CString};
+    use std::os::raw::c_char;
 
     fn _to_c_char(str: &str) -> *const c_char {
         CString::new(str).unwrap().into_raw()
@@ -331,94 +323,1433 @@ mod tests {
         json_c_str.to_str().unwrap()
     }
 
-    fn teardown() {
-        let p = Path::new("/tmp/imtoken/wallets");
-        let walk_dir = std::fs::read_dir(p).expect("read dir");
-        for entry in walk_dir {
-            let entry = entry.expect("DirEntry");
-            let fp = entry.path();
-            if !fp
-                .file_name()
-                .expect("file_name")
-                .to_str()
-                .expect("file_name str")
-                .ends_with(".json")
-            {
-                continue;
-            }
+    #[test]
+    fn test_derive_accounts() {
+        connect_and_bind();
+
+        let derivations = vec![
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/44'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/49'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/49'/1'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "NERVOS".to_string(),
+                path: "m/44'/309'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "m/44'/461'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "COSMOS".to_string(),
+                path: "m/44'/118'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "EOS".to_string(),
+                path: "m/44'/194'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "m/44'/60'/0'/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/44'/0'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/49'/0'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "m/44'/434'/0'/0'/0'".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "ed25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "m/44'/354'/0'/0'/0'".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "ed25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOINCASH".to_string(),
+                path: "m/44'/145'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "NERVOS".to_string(),
+                path: "m/44'/309'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "m/44'/461'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/44'/0'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/49'/0'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "COSMOS".to_string(),
+                path: "m/44'/118'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "EOS".to_string(),
+                path: "m/44'/194'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+        ];
+        let param = DeriveAccountsParam { derivations };
+        let action: ImkeyAction = ImkeyAction {
+            method: "derive_accounts".to_string(),
+            param: Some(::prost_types::Any {
+                type_url: "deviceapi.derive_accounts".to_string(),
+                value: encode_message(param).unwrap(),
+            }),
+        };
+        let action = hex::encode(encode_message(action).unwrap());
+        let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+        let ret_bytes = hex::decode(ret_hex).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(ret_bytes.as_slice()).unwrap();
+
+        assert_eq!(
+            "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP",
+            derived_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b",
+            derived_accounts.accounts[0].public_key
+        );
+        assert_eq!("xpub6D3MqTwuLWB5veAfhDjPu1oHfS6L1imVbf22zQFWJW9EtnSmYYqiGMGkW1MCsT2HmkW872tefMY9deewW6DGd8zE7RcXVv8wKhZnbJeidjT", derived_accounts.accounts[0].extended_public_key);
+        assert_eq!("MwDMFXVWDEuWvBogeW1v/MOMFDnGnnflm2JAPvJaJZO4HXp8fCsWETA7u8MzOW3KaPksglpUHLN3xkDr2QWMEQq0TewFZoZ3KsjmLW0KGMRN7XQKqo/omkSEsPfalVnp9Zxm2lpxVmIacqvlernVSg==", derived_accounts.accounts[0].encrypted_extended_public_key);
+
+        assert_eq!(
+            "MQHaFwU3DiWQoz48TqZHtZ4jF7tFDj9yQF",
+            derived_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x03ace3b0da84c9944a077d62fc839c95324c2bdaa01786353f5538f89fbc24f428",
+            derived_accounts.accounts[1].public_key
+        );
+        assert_eq!("xpub6DCrE779Ryz387SnYxktBSM6M8Q2G2xTsxK6XSwzwrtRwHyCtREopxRstj35QPdDfZY6XJTPnKWxQJHV35mKAjLHWXKahozqstkccmHvUgG", derived_accounts.accounts[1].extended_public_key);
+        assert_eq!("ZVejk1prSEDaxjlIH9Uk9wZXWW2GX4MqfWQ92Rmulh64ORupkjCfxIZRatgvQGneupHpw31REz+gjt1qOCeundhrpv2IlgIu51EDv5bp9hsEeON1vnKjC2rx+CezkwAOf15cMt59bXZM6fQSeIgJnA==", derived_accounts.accounts[1].encrypted_extended_public_key);
+
+        assert_eq!(
+            "mpke4CzhBTV2dFZpnABT9EN1kPc4vDWZxw",
+            derived_accounts.accounts[2].address
+        );
+        assert_eq!(
+            "0x031aee5e20399d68cf0035d1a21564868f22bc448ab205292b4279136b15ecaebc",
+            derived_accounts.accounts[2].public_key
+        );
+        assert_eq!("tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv", derived_accounts.accounts[2].extended_public_key);
+        assert_eq!("6lm577UNC0reTJjrMYWZm2GBjYqUjKWI1Y8X5hZ3XdSrsvEcjhO/m6bFUu3b21KDWDCe850mbUMi7U0Dx+Bt2ahFczqmgdCA3CnJPz4XUn5aNi/1kQpJSm7x92JJCWA3twQ0BSrg6HV+zYHm7voWKg==", derived_accounts.accounts[2].encrypted_extended_public_key);
 
-            remove_file(fp.as_path()).expect("should remove file");
+        assert_eq!(
+            "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2",
+            derived_accounts.accounts[3].address
+        );
+        assert_eq!(
+            "0x037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5",
+            derived_accounts.accounts[3].public_key
+        );
+        assert_eq!("tpubDCxD6k9PreNhSacpfSZ3iErESZnncY1n7qU7e3stZXLPh84xVVt5ERMAqKeefUU8jswx2GpCkQpeYow4xH3PGx2iim6ftPa32GNvTKAtknz", derived_accounts.accounts[3].extended_public_key);
+        assert_eq!("A6SCjz/iYksc/3pnVnMIzXimsQAm2p4EUJ1T6fRYkeHSqtSuBcF7O2Fyt3lYbiD4RoL1wf6VfknDiLdS1mcJyD09kXl5s+fuBaklKAZ2Dh6YuGlPGJqaGnrQ/rsTJ+Adb0ZRO3F3xGadXjiGb3hTSA==", derived_accounts.accounts[3].encrypted_extended_public_key);
+
+        assert_eq!(
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6",
+            derived_accounts.accounts[4].address
+        );
+        assert_eq!(
+            "0x03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd",
+            derived_accounts.accounts[4].public_key
+        );
+        assert_eq!("tpubDDMZ3uNczagkRgAQBT6vmHFwM6Tc8RwYKU4ufqywmZEUNVfYNNyrVyXgmSpDTVsthVEbEzH5QjhxQPExpjBtVXVWZinpdRjiRGtpXuALuND", derived_accounts.accounts[4].extended_public_key);
+        assert_eq!("VXhh0t5/x2aZJI0mKfkYREXX/VWw7PVEz4Gyf1bj9DS9ETRShdPA519gJMrbw8XJVk/p8X+ixbYras39ITKtl7KOSaE+E2T126r2NAR0gXRWOLIp2rrpnVWerlBkzjkoJ1KOKIPIIYhZYP7kn+tbSQ==", derived_accounts.accounts[4].encrypted_extended_public_key);
+
+        assert_eq!(
+            "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+            derived_accounts.accounts[5].address
+        );
+        assert_eq!(
+            "0x03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785",
+            derived_accounts.accounts[5].public_key
+        );
+        assert_eq!("tpubDDaEZaaDDmwnZTP6u7m3yTKFgnbSx2uTaxp1hKM5oiVZo6iBB46rWnWpdkpbPxtfdYiyLbyhqgbXRXYff3LfW4rCpYyfpb5pC67CPZdKkZB", derived_accounts.accounts[5].extended_public_key);
+        assert_eq!("PRImz4qL7pDJsEtqNVzVG9llzx+DN1XFbucDahOvyQ9g9yc5HWMdH6jAx4Mc/syseMWHLj9Y17Mfqib3sl88Ddgs3tTXhJq6vWToyXlQ6t9yg/LX1qKzLKcXLD+W0872G5m1urk//YOLIyhPkaLV2g==", derived_accounts.accounts[5].encrypted_extended_public_key);
+
+        assert_eq!(
+            "cosmos1ajz9y0x3wekez7tz2td2j6l2dftn28v26dd992",
+            derived_accounts.accounts[6].address
+        );
+        assert_eq!(
+            "0x0232c1ef21d73c19531b0aa4e863cf397c2b982b2f958f60cdb62969824c096d65",
+            derived_accounts.accounts[6].public_key
+        );
+        assert_eq!("xpub6CrWRZY39gj49G1ipdmcVunEnb5RoTGf9o6QnJQp8c4b84V2piN1Rdy1xWVJ4P7VXNx5Ckg6rZcvSNvJtvWz8zs3RkPayHn9vMMuK9ERrFr", derived_accounts.accounts[6].extended_public_key);
+        assert_eq!("rJQ+jO02Yn+Rdfjn5QbStU/2aS0T5zW5HU83JoHLBZHafsr8FSdG7lPV59XAw1LwuUCMCtRBueG1iJ2AsA76PP1zyVzj0LxDIq3iHAOxBdwIZDP5C1sY+RMGwXk+6a2OwmYN/zF/q2SL8D6aeGyD9g==", derived_accounts.accounts[6].encrypted_extended_public_key);
+
+        assert_eq!("", derived_accounts.accounts[7].address);
+        assert_eq!(
+            "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+            derived_accounts.accounts[7].public_key
+        );
+        assert_eq!("xpub6CUtvjXi3yjmhjaC2GxjiWE9FbQs1TrtqAgRDhB2gmDBsPzTfwqZ7MvGGYScKiVx8PBNFSmHm4mCnFDCaX23c1nJS4p8ynR2wnGne4qEEX9", derived_accounts.accounts[7].extended_public_key);
+        assert_eq!("jSPl9msMWjfMrj/09dRJ/epEWFnjjNHoOfro8xVrvcmhTnTC0iK+RDXXJ7iI2UpIa3ckFw7g2QGaVgODFQVLrEboEysXX5YMsPczdAUrdKh27vx5A3KMFylw2kVrUmSdoMDID8wlVfqkteyIHED0iQ==", derived_accounts.accounts[7].encrypted_extended_public_key);
+
+        assert_eq!(
+            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b",
+            derived_accounts.accounts[8].address
+        );
+        assert_eq!(
+            "0x0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe",
+            derived_accounts.accounts[8].public_key
+        );
+        assert_eq!("tpubDCvte6zYB6DKMaEy4fwyoXpuExA4ery3Hu6dVSBZeY9Rg57VKFLwNPMfywWtqRFM1Df5gQJTu42RaaNCgVEyngdVfnYRh9Kb1UCoEYojURc", derived_accounts.accounts[8].extended_public_key);
+        assert_eq!("w6s0ZvUoPPSiEi1xDMKy5X9+qwhcX4u3e3LOBosJaOSro2ny9jppDxcczZfrhe29n9H3UkmgNoecq/85xfXkGDtH8PMR9iclK5WrcUtkgjXsBcrR6JF0j58i4W9x3y539vXOsLMifCmUr2RcqknDgw==", derived_accounts.accounts[8].encrypted_extended_public_key);
+
+        assert_eq!(
+            "12z6UzsA3tjpaeuvA2Zr9jwx19Azz74D6g",
+            derived_accounts.accounts[9].address
+        );
+        assert_eq!(
+            "0x026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            derived_accounts.accounts[9].public_key
+        );
+        assert_eq!("xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8", derived_accounts.accounts[9].extended_public_key);
+        assert_eq!("BdgvWHN/Uh/K526q/+CdpGwEPZ41SvZHHGSgiSqhFesjErdbo6UnJMIoDOHV94qW8fd2KBW18UG3nTzDwS7a5oArqPtv+2aE9+1bNvCdtYoAx3979N3vbX4Xxn/najTABykXrJDjgpoaXxSo/xTktQ==", derived_accounts.accounts[9].encrypted_extended_public_key);
+
+        assert_eq!(
+            "3JmreiUEKn8P3SyLYmZ7C1YCd4r2nFy3Dp",
+            derived_accounts.accounts[10].address
+        );
+        assert_eq!(
+            "0x03036695c5f3de2e2792b170f59679d4db88a8516728012eaa42a22ce6f8bf593b",
+            derived_accounts.accounts[10].public_key
+        );
+        assert_eq!("xpub6Boii2KSAfEv7EhbBuopXKB2Gshi8kMpTGWyHuY9BHwYA8qPeu7ZYdnnXCuUdednhwyjyK2Z8gJD2AfawgBHp3Kkf2GjBjzEQAyJ3uJ4SuG", derived_accounts.accounts[10].extended_public_key);
+        assert_eq!("CPEZEgxonR02LextSVWxqQmH7zSjfNN44+0KYuTJ4ezARna34lG4YcX7nR5xvSrMhuRv4eI8BG+2h3Zz4523lNPp8Y6pEEtdJHSvTzS/APQYtdpHB3Hye+kQ+D7YuJ7Ps+LxoxFAwpic7a3CS+R+cw==", derived_accounts.accounts[10].encrypted_extended_public_key);
+
+        assert_eq!(
+            "Fde6T2hDvbvuQrRizcjPoQNZTxuVSbTp78zwFcxzUb86xXS",
+            derived_accounts.accounts[11].address
+        );
+        assert_eq!(
+            "0x873cf8e52a7b93a55197ef2846e9627a6f105b0a06c86659c813f1a50438b479",
+            derived_accounts.accounts[11].public_key
+        );
+        assert_eq!("", derived_accounts.accounts[11].extended_public_key);
+        assert_eq!(
+            "",
+            derived_accounts.accounts[11].encrypted_extended_public_key
+        );
+
+        assert_eq!(
+            "16NhUkUTkYsYRjMD22Sop2DF8MAXUsjPcYtgHF3t1ccmohx1",
+            derived_accounts.accounts[12].address
+        );
+        assert_eq!(
+            "0xedb9955556c8e07287df95ad77fad826168f8a50488cce0d738df3769e24613a",
+            derived_accounts.accounts[12].public_key
+        );
+        assert_eq!("", derived_accounts.accounts[12].extended_public_key);
+        assert_eq!(
+            "",
+            derived_accounts.accounts[12].encrypted_extended_public_key
+        );
+
+        assert_eq!(
+            "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
+            derived_accounts.accounts[13].address
+        );
+        assert_eq!(
+            "0x0251492dfb299f21e426307180b577f927696b6df0b61883215f88eb9685d3d449",
+            derived_accounts.accounts[13].public_key
+        );
+        assert_eq!("xpub6Bmkv3mmRZZWoFSBdj9vDMqR2PCPSP6DEj8u3bBuv44g3Ncnro6cPVqZAw6wTEcxHQuodkuJG4EmAinqrrRXGsN3HHnRRMtAvzfYTiBATV1", derived_accounts.accounts[13].extended_public_key);
+
+        assert_eq!(
+            "ckb1qyqtr684u76tu7r8efkd24hw8922xfvhnazst8nagx",
+            derived_accounts.accounts[14].address
+        );
+        assert_eq!(
+            "0x03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd",
+            derived_accounts.accounts[14].public_key
+        );
+        assert_eq!("xpub6CyvXfYwHJjJ9syYjG7qZMva1yMx93SUmqUcKHvoReUadCzqJA8mMXrrXQjRvzveuahgdQmCsdsuiCkMRsLec63DW83Wwu5UqKJQmsonKpo", derived_accounts.accounts[14].extended_public_key);
+
+        assert_eq!(
+            "f12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+            derived_accounts.accounts[15].address
+        );
+        assert_eq!(
+            "0x03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785",
+            derived_accounts.accounts[15].public_key
+        );
+        assert_eq!("xpub6DCc3LkXWVzLHfCFSvmxmXytMfVnxeQQ3LDiLmHwTojg3p3U6qFmNLqzPijosTwRqeC4j2TqJamUjM44GBVRcdPukxEN94Rac8WndUhfYEK", derived_accounts.accounts[15].extended_public_key);
+        assert_eq!("/zWESZN6UDRR8xZp/+puhlD0WsPheWx1+FILE+g3Ayilu3wk8L7HqErnFoOwFbH2q/VajmUM9nauncSyKs9RyO91oVoKV6Z1xOuS7nUHS3tJZHDbf2grG2Hrcoh2SiZpDycFxEPWpHCfD6cias4vLQ==", derived_accounts.accounts[15].encrypted_extended_public_key);
+
+        assert_eq!(
+            "mhW3n3x8rvB5MmPXsbYDyfAGs8mhw9GGaW",
+            derived_accounts.accounts[16].address
+        );
+        assert_eq!(
+            "0x026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            derived_accounts.accounts[16].public_key
+        );
+        assert_eq!("tpubDDDcs8o1LaKXKXaPTEVBUZJYTgNAte4xj24MtFCMsfrHku93ZZjy87CGyz93dcocR6x6JHdusHodD9EVcSQuDbmkAWznWZtvyqyMDqS6VK4", derived_accounts.accounts[16].extended_public_key);
+        assert_eq!("KN9qVdfibQ6+qM/gpglypnGYL0A5Wsu/hm7q5QHoAzUNRQUmKOmyQquyka2FNzSEIfBp/3PZemS/uhEEbbpJfSh7mhbKDQfNQHRalWLEXrfZvOk3Aaej7cxtMnm0UdzNQlYlbeCo/E43kcfCnlsKBw==", derived_accounts.accounts[16].encrypted_extended_public_key);
+
+        assert_eq!(
+            "2NAL4iTQFwEdjFEbtDuAyoxXTqR4Cd8qtSx",
+            derived_accounts.accounts[17].address
+        );
+        assert_eq!(
+            "0x03036695c5f3de2e2792b170f59679d4db88a8516728012eaa42a22ce6f8bf593b",
+            derived_accounts.accounts[17].public_key
+        );
+        assert_eq!("tpubDCBMEG97swCNP2tSe6nujEWPbzoN88rszu7GeTbHXChRuRW6j7xeh5TcmEzGA9b2VrWeatYRfn8FiMACLY2XhUn3id22sGeTz8ZhounC4Wa", derived_accounts.accounts[17].extended_public_key);
+        assert_eq!("LtJEXs9Hqofmtz+0eVqUcdnrX4Ax41/LFjPXVWr2zg/LSL9mbj09oVo4I8mmID2xm4Q+cCjMfmroYTUFJKJxZQ2jQwmbQP+eVlcFtmKzafaUEen+rbchlWbWRKLzyVFLBNT72I0SjplHi2f5QHKauA==", derived_accounts.accounts[17].encrypted_extended_public_key);
+
+        assert_eq!(
+            "cosmos1ajz9y0x3wekez7tz2td2j6l2dftn28v26dd992",
+            derived_accounts.accounts[18].address
+        );
+        assert_eq!(
+            "0x0232c1ef21d73c19531b0aa4e863cf397c2b982b2f958f60cdb62969824c096d65",
+            derived_accounts.accounts[18].public_key
+        );
+        assert_eq!("tpubDDE8woMirxgWR4CaGpkhhq7c7iB5nqmihRgi8rTxUWpUsM9jtwD6a5drCYa5at4jKHUypLByPfSy8ZQvHnNE2SKLVM8tepSPWJxK59Eegmh", derived_accounts.accounts[18].extended_public_key);
+        assert_eq!("BgtriGuk6ykY4ESnLsjreJCKdGcV/5evGC3/F1afYvIYvNkpdk4bTNf/Bpy3aQCabifcQtoDL6hc+wEFbEJ/xu2pxcmP8Qiu/tU70IlTMUoItYRIOc+qs3cJHOsIPB5jqfnpSNuJWHTEFgPSj8swmw==", derived_accounts.accounts[18].encrypted_extended_public_key);
+
+        assert_eq!("", derived_accounts.accounts[19].address);
+        assert_eq!(
+            "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+            derived_accounts.accounts[19].public_key
+        );
+        assert_eq!("tpubDCrXSyMPmFhDyXm3UTwpvRZWaiWWzrMxNoGiaFEB2fy5cgfAkAgeFob6WaXPrDTBvHiGs2HAJAbFURhoyNsHVTEbVfZSfK5GXjsCQ3kYMcy", derived_accounts.accounts[19].extended_public_key);
+        assert_eq!("GmqrouLXtLQX0uCLHClBSkupGErjvRRkcooO0xLJWE04j14KZeadxrAsJD4nqRPxbM99rzybs9FRY2jkqfR1OyEP3XDx7Vmn0iuYt/0y7aLsiAsma3iM5CwaXKuXFM3bFAuBRHUk3Meqhx2F8zmCBQ==", derived_accounts.accounts[19].encrypted_extended_public_key);
+    }
+
+    #[test]
+    fn test_ethereum_derive_sub_accounts() {
+        let mut derivation = Derivation {
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let derived_accounts_result = derive_account(derivation.clone());
+        let mut derive_sub_accounts_param = DeriveSubAccountsParam {
+            chain_type: "ETHEREUM".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: derived_accounts_result.accounts[0]
+                .extended_public_key
+                .to_string(),
+        };
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6CZG7sArTpFs5n47cUxtbcVXuq4QfUTykGWL8t8RJdPXvnSnF2VrDwgqjuS7JvJ7DK8B4pnbMxCNtPsbHdPjuFBCcBo81cfMRWcPUXWND3e",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "NgtbCRYto2FQ0yESmBA1NU1djYyJjSVdMq4qW+J1BrGBRAX0PUte5WoNtgmB9/XA+tGrQjkzovKH6WT963PcqJNlyBmAyjeKmL26+zKGa03+ropCiSLHqVZsVR1V/Cq6Ppz3meBvQRglORyZeE+98g==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "0x80427Ae1f55bCf60ee4CD2db7549b8BC69a74303",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x02ce64a99db44c98016264dc1c0748a1abf6df33035f8006b33f5fff68e26997b2",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "TESTNET".to_string();
+        let derived_accounts_result = derive_account(derivation);
+        derive_sub_accounts_param.network = "TESTNET".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDCvte6zYB6DKMaEy4fwyoXpuExA4ery3Hu6dVSBZeY9Rg57VKFLwNPMfywWtqRFM1Df5gQJTu42RaaNCgVEyngdVfnYRh9Kb1UCoEYojURc",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "w6s0ZvUoPPSiEi1xDMKy5X9+qwhcX4u3e3LOBosJaOSro2ny9jppDxcczZfrhe29n9H3UkmgNoecq/85xfXkGDtH8PMR9iclK5WrcUtkgjXsBcrR6JF0j58i4W9x3y539vXOsLMifCmUr2RcqknDgw==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "0x80427Ae1f55bCf60ee4CD2db7549b8BC69a74303",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x02ce64a99db44c98016264dc1c0748a1abf6df33035f8006b33f5fff68e26997b2",
+            derived_sub_accounts.accounts[1].public_key
+        );
+    }
+
+    #[test]
+    fn test_litecoin_derive_sub_accounts() {
+        let mut derivation = Derivation {
+            chain_type: "LITECOIN".to_string(),
+            path: "m/44'/2'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let derived_accounts_result = derive_account(derivation.clone());
+        let mut derive_sub_accounts_param = DeriveSubAccountsParam {
+            chain_type: "LITECOIN".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: derived_accounts_result.accounts[0]
+                .extended_public_key
+                .to_string(),
+        };
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6D3MqTwuLWB5veAfhDjPu1oHfS6L1imVbf22zQFWJW9EtnSmYYqiGMGkW1MCsT2HmkW872tefMY9deewW6DGd8zE7RcXVv8wKhZnbJeidjT",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "MwDMFXVWDEuWvBogeW1v/MOMFDnGnnflm2JAPvJaJZO4HXp8fCsWETA7u8MzOW3KaPksglpUHLN3xkDr2QWMEQq0TewFZoZ3KsjmLW0KGMRN7XQKqo/omkSEsPfalVnp9Zxm2lpxVmIacqvlernVSg==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "LavE5eHDvw9VDiNifbraR7GyY8MRvcQSLQ",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec",
+            derived_sub_accounts.accounts[1].public_key
+        );
+        derivation.network = "MAINNET".to_string();
+        derivation.seg_wit = "P2WPKH".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.seg_wit = "P2WPKH".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "M7xo1Mi1gULZSwgvu7VVEvrwMRqngmFkVd",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "MwDMFXVWDEuWvBogeW1v/MOMFDnGnnflm2JAPvJaJZO4HXp8fCsWETA7u8MzOW3KaPksglpUHLN3xkDr2QWMEQq0TewFZoZ3KsjmLW0KGMRN7XQKqo/omkSEsPfalVnp9Zxm2lpxVmIacqvlernVSg==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "MBDVivYGGiXzn2dP9Js3xtVViuQS3dyDwM",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "TESTNET".to_string();
+        derivation.seg_wit = "P2WPKH".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.network = "TESTNET".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "QLfctE6KMv3ZzQod6UA37w3EPTuLS4tg1T",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDQzMhmb3n8YCSMX9QiV6w8ezZBz17GZ9HcLLxJeeQu8e57UcmgoQnwak3RzPwyXZf32icQXCTNCKq9Ytx4WWaSXB2MqBSoAufACMGXurct",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "k4GbrxWCcsrGokCos50O69Wg9reixsDqPHkciU4xeUi9dpICotcOMQSgTgRd7XtGXXjdV/SUuTBkPXNQikqORvvW2CnHNe7+iJsTdHebynq2Y3ZXMFUWt8WJkgB5NotqkjOik89LvJBKYKvnon2B0g==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "QPvKbnvZxAF1KVk5LfXbqtfnkwTymMf2Xu",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.seg_wit = "NONE".to_string();
+        derivation.network = "TESTNET".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.seg_wit = "NONE".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDQzMhmb3n8YCSMX9QiV6w8ezZBz17GZ9HcLLxJeeQu8e57UcmgoQnwak3RzPwyXZf32icQXCTNCKq9Ytx4WWaSXB2MqBSoAufACMGXurct",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "k4GbrxWCcsrGokCos50O69Wg9reixsDqPHkciU4xeUi9dpICotcOMQSgTgRd7XtGXXjdV/SUuTBkPXNQikqORvvW2CnHNe7+iJsTdHebynq2Y3ZXMFUWt8WJkgB5NotqkjOik89LvJBKYKvnon2B0g==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "mwDE7V4NfJLgk2ABD2qey1RYBuarjJvT7E",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.seg_wit = "NONE".to_string();
+        derivation.network = "TESTNET".to_string();
+        derivation.path = "m/49'/2'/0'/0/0".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "n4LXNPmmpMzGfeftriMfJrKDojno8krTPE",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x03ace3b0da84c9944a077d62fc839c95324c2bdaa01786353f5538f89fbc24f428",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDaUkLvq9FwVPude19jyPMgTgFVgFRTXRauPt119HmeKgaduxe5tyQ6i8m7rvtaTTU518syGKRM16Un6RwcZ4Anaa84tPLf5TrM2NkJqcFR",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "uxVleeSObdFyxAmXftrBg/hxO6fZufUues2Lh9IrMD+rdYjvJ7wKeXaa2sBtklP9vKRa8RpDDC4odNghyTNS9Bt5y98GL7rXOknJIdBONKyBpcQ9spRibfge2OYAHzqQ/B409Ja3RqoIh9jezhHEwg==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "mmMJYEkfiUNbSKcBt6oUGLLbNd51PsuD5A",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x027768573bc46ee4997262ceb327019c3808ae0ae995befc42f721875bd9ec4097",
+            derived_sub_accounts.accounts[1].public_key
+        );
+    }
+
+    #[test]
+    fn test_tron_derive_sub_accounts() {
+        let derivation = Derivation {
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let derived_accounts_result = derive_account(derivation);
+        let derive_sub_accounts_param = DeriveSubAccountsParam {
+            chain_type: "TRON".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: derived_accounts_result.accounts[0]
+                .extended_public_key
+                .to_string(),
+        };
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param);
+        assert_eq!(
+            "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDCxD6k9PreNhSacpfSZ3iErESZnncY1n7qU7e3stZXLPh84xVVt5ERMAqKeefUU8jswx2GpCkQpeYow4xH3PGx2iim6ftPa32GNvTKAtknz",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "A6SCjz/iYksc/3pnVnMIzXimsQAm2p4EUJ1T6fRYkeHSqtSuBcF7O2Fyt3lYbiD4RoL1wf6VfknDiLdS1mcJyD09kXl5s+fuBaklKAZ2Dh6YuGlPGJqaGnrQ/rsTJ+Adb0ZRO3F3xGadXjiGb3hTSA==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "TC1nbfByaLWHvK8haEFTkMZJBNxsnKfqKh",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x03f6a261f3b4d7c24014f2026b09ad409076c566b39b99b8e0a7196f391caec508",
+            derived_sub_accounts.accounts[1].public_key
+        );
+    }
+
+    #[test]
+    fn test_nervos_derive_sub_accounts() {
+        let mut derivation = Derivation {
+            chain_type: "NERVOS".to_string(),
+            path: "m/44'/309'/0'/0/0".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let derived_accounts_result = derive_account(derivation.clone());
+        let mut derive_sub_accounts_param = DeriveSubAccountsParam {
+            chain_type: "NERVOS".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: derived_accounts_result.accounts[0]
+                .extended_public_key
+                .to_string(),
+        };
+
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDMZ3uNczagkRgAQBT6vmHFwM6Tc8RwYKU4ufqywmZEUNVfYNNyrVyXgmSpDTVsthVEbEzH5QjhxQPExpjBtVXVWZinpdRjiRGtpXuALuND",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "VXhh0t5/x2aZJI0mKfkYREXX/VWw7PVEz4Gyf1bj9DS9ETRShdPA519gJMrbw8XJVk/p8X+ixbYras39ITKtl7KOSaE+E2T126r2NAR0gXRWOLIp2rrpnVWerlBkzjkoJ1KOKIPIIYhZYP7kn+tbSQ==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "ckt1qyqtg4mjvamq80xvwyv5kf2hqelmxcwpuzfsknt33c",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x02adb93db516b607059d2d09976b1ed1fce2d71b2343964477438ab63d7f42b61a",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "MAINNET".to_string();
+        let derived_accounts_result = derive_account(derivation);
+        derive_sub_accounts_param.network = "MAINNET".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param);
+        assert_eq!(
+            "ckb1qyqtr684u76tu7r8efkd24hw8922xfvhnazst8nagx",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6CyvXfYwHJjJ9syYjG7qZMva1yMx93SUmqUcKHvoReUadCzqJA8mMXrrXQjRvzveuahgdQmCsdsuiCkMRsLec63DW83Wwu5UqKJQmsonKpo",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "51mAHL9xbvjj1yDQ+MyohjLrWVTT2dkWegGfzoDN09qJ2mvCABLYgzyRTEwfTL7Eygd+KH3DyGp6DwhoVOgj02ISYLmsFysI3sqdEWd+7IId0m9xgym75Gl2nKeoH+WVPKOsPLf+w+cbyXRsnA6/3w==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "ckb1qyqtg4mjvamq80xvwyv5kf2hqelmxcwpuzfstk4way",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x02adb93db516b607059d2d09976b1ed1fce2d71b2343964477438ab63d7f42b61a",
+            derived_sub_accounts.accounts[1].public_key
+        );
+    }
+
+    #[test]
+    fn test_filecoin_derive_sub_accounts() {
+        let mut derivation = Derivation {
+            chain_type: "FILECOIN".to_string(),
+            path: "m/44'/461'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let derived_accounts_result = derive_account(derivation.clone());
+        let mut derive_sub_accounts_param = DeriveSubAccountsParam {
+            chain_type: "FILECOIN".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: derived_accounts_result.accounts[0]
+                .extended_public_key
+                .to_string(),
+        };
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "f12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6DCc3LkXWVzLHfCFSvmxmXytMfVnxeQQ3LDiLmHwTojg3p3U6qFmNLqzPijosTwRqeC4j2TqJamUjM44GBVRcdPukxEN94Rac8WndUhfYEK",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "/zWESZN6UDRR8xZp/+puhlD0WsPheWx1+FILE+g3Ayilu3wk8L7HqErnFoOwFbH2q/VajmUM9nauncSyKs9RyO91oVoKV6Z1xOuS7nUHS3tJZHDbf2grG2Hrcoh2SiZpDycFxEPWpHCfD6cias4vLQ==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "f1kozkcmzqvmr2bael2m3pu54fc5gibmissybkxzi",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x030bdac51c69b728fc6965b07b1737c3ae3d41e3d31b377c9b5158510d98655b91",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "TESTNET".to_string();
+        let derived_accounts_result = derive_account(derivation);
+        derive_sub_accounts_param.network = "TESTNET".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param);
+        assert_eq!(
+            "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDaEZaaDDmwnZTP6u7m3yTKFgnbSx2uTaxp1hKM5oiVZo6iBB46rWnWpdkpbPxtfdYiyLbyhqgbXRXYff3LfW4rCpYyfpb5pC67CPZdKkZB",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "PRImz4qL7pDJsEtqNVzVG9llzx+DN1XFbucDahOvyQ9g9yc5HWMdH6jAx4Mc/syseMWHLj9Y17Mfqib3sl88Ddgs3tTXhJq6vWToyXlQ6t9yg/LX1qKzLKcXLD+W0872G5m1urk//YOLIyhPkaLV2g==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "t1kozkcmzqvmr2bael2m3pu54fc5gibmissybkxzi",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x030bdac51c69b728fc6965b07b1737c3ae3d41e3d31b377c9b5158510d98655b91",
+            derived_sub_accounts.accounts[1].public_key
+        );
+    }
+
+    #[test]
+    fn test_bitcoin_derive_sub_accounts() {
+        let mut derivation = Derivation {
+            chain_type: "BITCOIN".to_string(),
+            path: "m/44'/0'/0'/0/0".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let derived_accounts_result = derive_account(derivation.clone());
+        let mut derive_sub_accounts_param = DeriveSubAccountsParam {
+            chain_type: "BITCOIN".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: derived_accounts_result.accounts[0]
+                .extended_public_key
+                .to_string(),
+        };
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "mhW3n3x8rvB5MmPXsbYDyfAGs8mhw9GGaW",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDDcs8o1LaKXKXaPTEVBUZJYTgNAte4xj24MtFCMsfrHku93ZZjy87CGyz93dcocR6x6JHdusHodD9EVcSQuDbmkAWznWZtvyqyMDqS6VK4",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "KN9qVdfibQ6+qM/gpglypnGYL0A5Wsu/hm7q5QHoAzUNRQUmKOmyQquyka2FNzSEIfBp/3PZemS/uhEEbbpJfSh7mhbKDQfNQHRalWLEXrfZvOk3Aaej7cxtMnm0UdzNQlYlbeCo/E43kcfCnlsKBw==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "mobyyve7CppjKQGFy9j82P5Eccr4PxHeqS",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "TESTNET".to_string();
+        derivation.seg_wit = "P2WPKH".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.network = "TESTNET".to_string();
+        derive_sub_accounts_param.seg_wit = "P2WPKH".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "2NCTX2isUH3bwkrSab6kJT1Eu9pWPqAStRp",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "tpubDDDcs8o1LaKXKXaPTEVBUZJYTgNAte4xj24MtFCMsfrHku93ZZjy87CGyz93dcocR6x6JHdusHodD9EVcSQuDbmkAWznWZtvyqyMDqS6VK4",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "KN9qVdfibQ6+qM/gpglypnGYL0A5Wsu/hm7q5QHoAzUNRQUmKOmyQquyka2FNzSEIfBp/3PZemS/uhEEbbpJfSh7mhbKDQfNQHRalWLEXrfZvOk3Aaej7cxtMnm0UdzNQlYlbeCo/E43kcfCnlsKBw==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "2NFVTYd5GHvFtC6KcHVRHUkHq5qepoRgtxA",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "MAINNET".to_string();
+        derivation.seg_wit = "NONE".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.network = "MAINNET".to_string();
+        derive_sub_accounts_param.seg_wit = "NONE".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "12z6UzsA3tjpaeuvA2Zr9jwx19Azz74D6g",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "BdgvWHN/Uh/K526q/+CdpGwEPZ41SvZHHGSgiSqhFesjErdbo6UnJMIoDOHV94qW8fd2KBW18UG3nTzDwS7a5oArqPtv+2aE9+1bNvCdtYoAx3979N3vbX4Xxn/najTABykXrJDjgpoaXxSo/xTktQ==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "1962gsZ8PoPUYHneFakkCTrukdFMVQ4i4T",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.network = "MAINNET".to_string();
+        derivation.seg_wit = "P2WPKH".to_string();
+        let derived_accounts_result = derive_account(derivation.clone());
+        derive_sub_accounts_param.network = "MAINNET".to_string();
+        derive_sub_accounts_param.seg_wit = "P2WPKH".to_string();
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param.clone());
+        assert_eq!(
+            "3LuJxywSfb6bZ4p2uy8Rq4FdwUJDxkwsmT",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "BdgvWHN/Uh/K526q/+CdpGwEPZ41SvZHHGSgiSqhFesjErdbo6UnJMIoDOHV94qW8fd2KBW18UG3nTzDwS7a5oArqPtv+2aE9+1bNvCdtYoAx3979N3vbX4Xxn/najTABykXrJDjgpoaXxSo/xTktQ==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "3PwFUt9EgTkXzJh4cMoQroJZsVSf3w65mN",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d",
+            derived_sub_accounts.accounts[1].public_key
+        );
+
+        derivation.path = "m/49'/0'/0'/0/0".to_string();
+        let derived_accounts_result = derive_account(derivation);
+        derive_sub_accounts_param.extended_public_key = derived_accounts_result.accounts[0]
+            .extended_public_key
+            .to_string();
+        let derived_sub_accounts = derive_sub_account(derive_sub_accounts_param);
+        assert_eq!(
+            "3JmreiUEKn8P3SyLYmZ7C1YCd4r2nFy3Dp",
+            derived_sub_accounts.accounts[0].address
+        );
+        assert_eq!(
+            "0x03036695c5f3de2e2792b170f59679d4db88a8516728012eaa42a22ce6f8bf593b",
+            derived_sub_accounts.accounts[0].public_key
+        );
+        assert_eq!(
+            "xpub6Boii2KSAfEv7EhbBuopXKB2Gshi8kMpTGWyHuY9BHwYA8qPeu7ZYdnnXCuUdednhwyjyK2Z8gJD2AfawgBHp3Kkf2GjBjzEQAyJ3uJ4SuG",
+            derived_sub_accounts.accounts[0].extended_public_key
+        );
+        assert_eq!(
+            "CPEZEgxonR02LextSVWxqQmH7zSjfNN44+0KYuTJ4ezARna34lG4YcX7nR5xvSrMhuRv4eI8BG+2h3Zz4523lNPp8Y6pEEtdJHSvTzS/APQYtdpHB3Hye+kQ+D7YuJ7Ps+LxoxFAwpic7a3CS+R+cw==",
+            derived_sub_accounts.accounts[0].encrypted_extended_public_key
+        );
+        assert_eq!(
+            "33xJxujVGf4qBmPTnGW9P8wrKCmT7Nwt3t",
+            derived_sub_accounts.accounts[1].address
+        );
+        assert_eq!(
+            "0x0394f89191b900da3b605d0334a8fe7f3d4bad7031ebc2bdca36b32b929551fa9c",
+            derived_sub_accounts.accounts[1].public_key
+        );
+    }
+
+    #[test]
+    fn test_get_extended_public_keys() {
+        connect_and_bind();
+
+        let derivations = vec![
+            PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/44'/145'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "m/44'/60'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/0/1".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/44'/145'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "m/44'/60'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "COSMOS".to_string(),
+                path: "m/44'/118'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "m/44'/461'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "EOS".to_string(),
+                path: "m/44'/194'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "NERVOS".to_string(),
+                path: "m/44'/309'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+        ];
+        let param = GetExtendedPublicKeysParam { derivations };
+        let action: ImkeyAction = ImkeyAction {
+            method: "get_extended_public_keys".to_string(),
+            param: Some(::prost_types::Any {
+                type_url: "get_extended_public_keys".to_string(),
+                value: encode_message(param).unwrap(),
+            }),
+        };
+        let action = hex::encode(encode_message(action).unwrap());
+        let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+        let ret_bytes = hex::decode(ret_hex).unwrap();
+        let extended_public_key: GetExtendedPublicKeysResult =
+            GetExtendedPublicKeysResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(extended_public_key.extended_public_keys[0], "xpub6GZjFnyumLtEwC4KQkigvc3vXJdZvy71QxHTsFQQv1YtEUWNEwynKWsK2LBFZNLWdTk3w1Y9cRv4NN7V2pnDBoWgH3PkVE9r9Q2kSQL2zkH");
+        assert_eq!(extended_public_key.extended_public_keys[1], "xpub6FmdMKZ36pLzf1iF7DLCzKtZms33cZ6mVjvBSy2dCPugFCH23cS3jgHfQ9PKmxs989ZyiyALuADMtLokCzpw7Fi35ap4uybfQAY5WVakan7");
+        assert_eq!(extended_public_key.extended_public_keys[2], "xpub6AQmexrYd5utZNmD9Gnf4CjrzJ4kuvaxacLyuSD5sA34g4oKuzBpX5rhAZrCZoxkcqWLVyWSz1rEh5ECs4PDRN16PLfNKFftxm48y6zsWX3");
+        assert_eq!(extended_public_key.extended_public_keys[3], "xpub6Bmkv3mmRZZWoFSBdj9vDMqR2PCPSP6DEj8u3bBuv44g3Ncnro6cPVqZAw6wTEcxHQuodkuJG4EmAinqrrRXGsN3HHnRRMtAvzfYTiBATV1");
+        assert_eq!(extended_public_key.extended_public_keys[4], "xpub6CZG7sArTpFs5n47cUxtbcVXuq4QfUTykGWL8t8RJdPXvnSnF2VrDwgqjuS7JvJ7DK8B4pnbMxCNtPsbHdPjuFBCcBo81cfMRWcPUXWND3e");
+        assert_eq!(extended_public_key.extended_public_keys[5], "xpub6CrWRZY39gj49G1ipdmcVunEnb5RoTGf9o6QnJQp8c4b84V2piN1Rdy1xWVJ4P7VXNx5Ckg6rZcvSNvJtvWz8zs3RkPayHn9vMMuK9ERrFr");
+        assert_eq!(extended_public_key.extended_public_keys[6], "xpub6DCc3LkXWVzLHfCFSvmxmXytMfVnxeQQ3LDiLmHwTojg3p3U6qFmNLqzPijosTwRqeC4j2TqJamUjM44GBVRcdPukxEN94Rac8WndUhfYEK");
+        assert_eq!(extended_public_key.extended_public_keys[7], "xpub6CaaaWKi9NRFAnRyDFZxWKWs7Sh8d9WiaCspHVpkDcaVwqQFRH2z5ygLbHZs8yWtwyR3QhJLDJzbrdSTZRC9PWaRfAMNCruoSJnWhKFFCWV");
+        assert_eq!(extended_public_key.extended_public_keys[8], "xpub6CUtvjXi3yjmhjaC2GxjiWE9FbQs1TrtqAgRDhB2gmDBsPzTfwqZ7MvGGYScKiVx8PBNFSmHm4mCnFDCaX23c1nJS4p8ynR2wnGne4qEEX9");
+        assert_eq!(extended_public_key.extended_public_keys[9], "xpub6CyvXfYwHJjJ9syYjG7qZMva1yMx93SUmqUcKHvoReUadCzqJA8mMXrrXQjRvzveuahgdQmCsdsuiCkMRsLec63DW83Wwu5UqKJQmsonKpo");
+    }
+
+    #[test]
+    fn test_get_extended_public_keys_error_case() {
+        connect_and_bind();
+
+        let test_data = vec![
+            vec![PublicKeyDerivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "m/44'/354'/0'/0'/0'".to_string(),
+                curve: "ed25519".to_string(),
+            }],
+            vec![PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "".to_string(),
+                curve: "secp256k1".to_string(),
+            }],
+            vec![PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/0".to_string(),
+                curve: "secp256k1".to_string(),
+            }],
+        ];
+        for i in 0..test_data.len() {
+            let param = GetExtendedPublicKeysParam {
+                derivations: test_data[i].clone(),
+            };
+            let action: ImkeyAction = ImkeyAction {
+                method: "get_extended_public_keys".to_string(),
+                param: Some(::prost_types::Any {
+                    type_url: "get_extended_public_keys".to_string(),
+                    value: encode_message(param).unwrap(),
+                }),
+            };
+            let action = hex::encode(encode_message(action).unwrap());
+            let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+            let err = unsafe { _to_str(imkey_get_last_err_message()) };
+            assert!(!err.is_empty());
+            let error_ret: ErrorResponse =
+                ErrorResponse::decode(hex::decode(err).unwrap().as_slice()).unwrap();
+            match i {
+                0 => {
+                    assert_eq!(error_ret.error, "unsupported_curve_type");
+                }
+                1 => {
+                    assert_eq!(error_ret.error, "imkey_path_illegal");
+                }
+                2 => {
+                    assert_eq!(error_ret.error, "imkey_path_illegal");
+                }
+                _ => {}
+            };
         }
     }
 
-    // fn run_test<T>(test: T) -> ()
-    //     where
-    //         T: FnOnce() -> () + panic::UnwindSafe,
-    // {
-    //     setup();
-    //     let result = panic::catch_unwind(|| test());
-    //     teardown();
-    //     assert!(result.is_ok())
-    // }
+    #[test]
+    fn test_get_public_keys() {
+        connect_and_bind();
+
+        let derivations = vec![
+            PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/44'/145'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "m/44'/60'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "EOS".to_string(),
+                path: "m/44'/194'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "COSMOS".to_string(),
+                path: "m/44'/118'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "BITCOINCASH".to_string(),
+                path: "m/44'/145'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/44'/2'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "NERVOS".to_string(),
+                path: "m/44'/309'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "m/44'/354'/0'".to_string(),
+                curve: "ed25519".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "m/44'/434'/0'".to_string(),
+                curve: "ed25519".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "m/44'/461'/0'".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+            },
+            PublicKeyDerivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "m/0'/0'".to_string(),
+                curve: "ed25519".to_string(),
+            },
+        ];
+        let param = GetPublicKeysParam { derivations };
+        let action: ImkeyAction = ImkeyAction {
+            method: "get_public_keys".to_string(),
+            param: Some(::prost_types::Any {
+                type_url: "get_public_keys".to_string(),
+                value: encode_message(param).unwrap(),
+            }),
+        };
+        let action = hex::encode(encode_message(action).unwrap());
+        let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+        let ret_bytes = hex::decode(ret_hex).unwrap();
+        let result: GetPublicKeysResult =
+            GetPublicKeysResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            result.public_keys[0],
+            "0x0303f2f84851514bf2f40a46b5bb9dbf4e5913fbacde1a96968cda08f9fd882caa"
+        );
+        assert_eq!(
+            result.public_keys[1],
+            "0x03f3175613d999d15e6fde436825a3cc2c568f8f5082275f06eb4bd6e561f503ac"
+        );
+        assert_eq!(
+            result.public_keys[2],
+            "EOS7ik8DKrvmBBKZHePgRSJiFhKoG1r3w8wNBwtRE9rTntW8yYmSk"
+        );
+        assert_eq!(
+            result.public_keys[3],
+            "0x03cca080a087467a703b01a1f87a65f3e4e566508c6f85f5582a6973a77c80c35e"
+        );
+        assert_eq!(
+            result.public_keys[4],
+            "0x0303f2f84851514bf2f40a46b5bb9dbf4e5913fbacde1a96968cda08f9fd882caa"
+        );
+        assert_eq!(
+            result.public_keys[5],
+            "0x02c7709248e6205fefa7366efb0269021f1f2f1e04fdc334fe7c7fd2628d7451e8"
+        );
+        assert_eq!(
+            result.public_keys[6],
+            "0x03349ff19e96c1aa7f568e493f85fa506320410245b4e69146bb0d3d8b5df3b901"
+        );
+        assert_eq!(
+            result.public_keys[7],
+            "0x03ad9d0e2d9181e23c7075a56ed4f10e249aaf38a2bb7aa0cb604f8b768ea84b86"
+        );
+        assert_eq!(
+            result.public_keys[8],
+            "0x2d9aecea337e9eee9d9a86f2d81aadafa88557fe5fb49efa187ce8ca3bc4e2a2"
+        );
+        assert_eq!(
+            result.public_keys[9],
+            "0x5fcd1bec698400671d396c7f3507441a9b62340731b53aebf0a58c57512b5c45"
+        );
+        assert_eq!(
+            result.public_keys[10],
+            "0x02611325073f61ae5feb6c8dce96857d007cdb765937e53e43e6f91374dac62edb"
+        );
+        assert_eq!(
+            result.public_keys[11],
+            "0x0330f3b39c1a4278db118d2a8e8cd1fd5bd574d6fac43040f5ec514ad6cc776892"
+        );
+        assert_eq!(
+            result.public_keys[12],
+            "0x4f3f24c064893a591d5a5b31990de9d12ed9da0c8650bcf98ede27e3da141401"
+        );
+    }
 
     #[test]
-    #[ignore]
-    fn call_api() {
-        // let param = TcxAction {
-        //     method: method.to_string(),
-        //     param: Some(::prost_types::Any {
-        //         type_url: "imtoken".to_string(),
-        //         value: encode_message(msg).unwrap(),
-        //     }),
-        // };
-
-        // let err_bytes = hex::decode("1233e69caae883bde5ae8ce68890e6938de4bd9ce38082efbc88746f6b656e2e4170694572726f72e99499e8afaf31e38082efbc89").unwrap();
-        // let err: ErrorResponse = ErrorResponse::decode(err_bytes.as_slice()).unwrap();
-        // assert_eq!("err", err.error);
-
-        // assert_eq!(true, is_valid_hex("0x9d30F9D302989cA1df6e4DB8361fc2535997Cfb7f7e98fc1-2bb1-4588-9803-5f409ce7e3a2"), "is invalid hex");
-        // let param = hex::decode("124263616c6c65642060526573756c743a3a756e77726170282960206f6e20616e2060457272602076616c75653a20496d6b6579557365724e6f74436f6e6669726d6564").unwrap();
-        // let action: ImkeyAction = ImkeyAction::decode(param.as_slice()).unwrap();
-        // let param: SignParam =
-        //     SignParam::decode(action.param.unwrap().value.as_slice()).unwrap();
-        // assert_eq!("action", param.chain_type);
-
-        // let param: AppDownloadReq = AppDownloadReq::decode(err.param.unwrap().value.as_slice()).unwrap();
-        // assert_eq!("action", param.app_name);
-        // let param: AppDownloadReq = AppDownloadReq {
-        //     app_name: "FILECOIN".to_string()
-        // };
-        // let action: ImkeyAction = ImkeyAction {
-        //     method: "app_download".to_string(),
-        //     param: Some(::prost_types::Any {
-        //         type_url: "deviceapi.AppDownloadReq".to_string(),
-        //         value: encode_message(param).unwrap(),
-        //     })
-        // };
-        // assert_eq!("", hex::encode(encode_message(action).unwrap()));
-        let _ = unsafe { imkey_clear_err() };
-        // let param_bytes = encode_message(param).unwrap();
-        // let param_bytes = hex::decode("0a0c636865636b5f757064617465").unwrap();
-        // let param_hex = hex::encode(param_bytes);
-        hid_connect("imKey Pro").is_ok();
-        let check_result =
-            DeviceManage::bind_check(&"../test-data".to_string()).unwrap_or_default();
-        // DeviceManage::bind_acquire(&"".to_string()).unwrap();
-        // device::device_manager::app_delete("BCH");
-        device::device_manager::app_download("BTC");
-        let ret_hex = unsafe {
-            _to_str(call_imkey_api(_to_c_char(&"0a077369676e5f747812e6030a10636f6d6d6f6e2e5369676e506172616d12d1030a0b424954434f494e4341534812116d2f3434272f313435272f30272f302f301a074d41494e4e455422b2020a19627463666f726b6170692e427463466f726b5478496e7075741294020a2a71707a36376763776139616738346c6a6d6d6e33753774636a6d39726b63326a66636a6b32717a66637510a08d061aaa010a4061346439666561373337636236633030326337613833666235383531613366373566306163646437626237663137373232633162323465653765306232336461100018c09a0c222a7171687979616a75323270637967783870683035716a6e787978616c686d65736b796371706d67786e302a323736613931343265343237363563353238333832323063373064646634303461363632316262666265663330623138386163320020c6032801322a7171687979616a75323270637967783870683035716a6e787978616c686d65736b796371706d67786e303a044e4f4e452a09302e30303120424348322a71707a36376763776139616738346c6a6d6d6e33753774636a6d39726b63326a66636a6b32717a6663753a2a7171687979616a75323270637967783870683035716a6e787978616c686d65736b796371706d67786e30420e302e303030303034353420424348")))
+    fn test_get_public_keys_error_case() {
+        connect_and_bind();
+
+        let derivations = vec![PublicKeyDerivation {
+            chain_type: "POLKADOT".to_string(),
+            path: "m/44'/354'/0'/0'/0'".to_string(),
+            curve: "sr25519".to_string(),
+        }];
+        let param = GetPublicKeysParam { derivations };
+        let action: ImkeyAction = ImkeyAction {
+            method: "get_public_keys".to_string(),
+            param: Some(::prost_types::Any {
+                type_url: "get_public_keys".to_string(),
+                value: encode_message(param).unwrap(),
+            }),
         };
+        let action = hex::encode(encode_message(action).unwrap());
+        let _ = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
         let err = unsafe { _to_str(imkey_get_last_err_message()) };
-        if !err.is_empty() {
-            let err_bytes = hex::decode(err).unwrap();
-            let err_ret: ErrorResponse = ErrorResponse::decode(err_bytes.as_slice()).unwrap();
-            assert_eq!("err", err_ret.error)
-        } else {
-            let ret_bytes = hex::decode(ret_hex).unwrap();
+        assert!(!err.is_empty());
+        let error_ret: ErrorResponse =
+            ErrorResponse::decode(hex::decode(err).unwrap().as_slice()).unwrap();
+        assert_eq!(error_ret.error, "unsupported_curve_type");
+    }
+
+    fn derive_account(derivation: Derivation) -> DeriveAccountsResult {
+        connect_and_bind();
+
+        let derivations = vec![derivation];
+        let param = DeriveAccountsParam { derivations };
+        let action: ImkeyAction = ImkeyAction {
+            method: "derive_accounts".to_string(),
+            param: Some(::prost_types::Any {
+                type_url: "deviceapi.derive_accounts".to_string(),
+                value: encode_message(param).unwrap(),
+            }),
+        };
+        let action = hex::encode(encode_message(action).unwrap());
+        let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+        let ret_bytes = hex::decode(ret_hex).unwrap();
+        DeriveAccountsResult::decode(ret_bytes.as_slice()).unwrap()
+    }
 
-            let ret: CommonResponse = CommonResponse::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!("ret", ret.result)
+    fn derive_sub_account(param: DeriveSubAccountsParam) -> DeriveSubAccountsResult {
+        let action: ImkeyAction = ImkeyAction {
+            method: "derive_sub_accounts".to_string(),
+            param: Some(::prost_types::Any {
+                type_url: "deviceapi.derive_sub_accounts".to_string(),
+                value: encode_message(param).unwrap(),
+            }),
+        };
+        let action = hex::encode(encode_message(action).unwrap());
+        let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+        let ret_bytes = hex::decode(ret_hex).unwrap();
+        DeriveSubAccountsResult::decode(ret_bytes.as_slice()).unwrap()
+    }
+
+    fn connect_and_bind() {
+        assert!(hid_connect("imKey Pro").is_ok());
+        let action: ImkeyAction = ImkeyAction {
+            method: "bind_check".to_string(),
+            param: None,
+        };
+        let action = hex::encode(encode_message(action).unwrap());
+        let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+        let ret_bytes = hex::decode(ret_hex).unwrap();
+        let bind_result: BindCheckRes = BindCheckRes::decode(ret_bytes.as_slice()).unwrap();
+        if "bound_other".eq(&bind_result.bind_status) {
+            let param = BindAcquireReq {
+                bind_code: "7FVRAJJ7".to_string(),
+            };
+            let action: ImkeyAction = ImkeyAction {
+                method: "bind_acquire".to_string(),
+                param: Some(::prost_types::Any {
+                    type_url: "deviceapi.bind_acquire".to_string(),
+                    value: encode_message(param).unwrap(),
+                }),
+            };
+            let action = hex::encode(encode_message(action).unwrap());
+            let ret_hex = unsafe { _to_str(call_imkey_api(_to_c_char(action.as_str()))) };
+            let ret_bytes = hex::decode(ret_hex).unwrap();
+            let bind_result: BindCheckRes = BindCheckRes::decode(ret_bytes.as_slice()).unwrap();
+            assert_eq!("success", bind_result.bind_status);
         }
     }
 }
diff --git a/imkey-core/ikc/src/message_handler.rs b/imkey-core/ikc/src/message_handler.rs
index a657ba9d..0d6d8086 100644
--- a/imkey-core/ikc/src/message_handler.rs
+++ b/imkey-core/ikc/src/message_handler.rs
@@ -3,7 +3,6 @@ use bytes::BytesMut;
 use prost::Message;
 
 pub fn encode_message(msg: impl Message) -> Result<Vec<u8>> {
-    println!("{:#?}", msg);
     let mut buf = BytesMut::with_capacity(msg.encoded_len());
     //    msg.encode(&mut buf).map_err(|_err| Error::ProtoError)?;
     msg.encode(&mut buf)?;
diff --git a/imkey-core/ikc/src/nervos_address.rs b/imkey-core/ikc/src/nervos_address.rs
index 247edd67..7dc267a2 100644
--- a/imkey-core/ikc/src/nervos_address.rs
+++ b/imkey-core/ikc/src/nervos_address.rs
@@ -1,25 +1,18 @@
 use crate::api::{AddressParam, AddressResult, BtcForkWallet};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
-use bitcoin::Network;
 use coin_ckb::address::CkbAddress;
-use prost::Message;
+use ikc_common::path::get_account_path;
 
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
-    let network = match param.network.as_ref() {
-        "MAINNET" => Network::Bitcoin,
-        "TESTNET" => Network::Testnet,
-        _ => Network::Testnet,
-    };
-
     let address = CkbAddress::get_address(param.network.as_ref(), param.path.as_ref())?;
-    let account_path = ikc_common::utility::get_account_path(&param.path)?;
-    let enc_xpub = CkbAddress::get_enc_xpub(network, &account_path)?;
+    let account_path = get_account_path(&param.path)?;
+    let enc_xpub = CkbAddress::get_enc_xpub(&param.network, &account_path)?;
 
     let address_message = BtcForkWallet {
         path: param.path.to_owned(),
         chain_type: param.chain_type.to_string(),
-        address: address,
+        address,
         enc_x_pub: enc_xpub,
     };
     encode_message(address_message)
@@ -35,26 +28,3 @@ pub fn display_address(param: &AddressParam) -> Result<Vec<u8>> {
     };
     encode_message(address_message)
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::api::AddressParam;
-    use crate::nervos_address::get_address;
-    use ikc_common::{XPUB_COMMON_IV, XPUB_COMMON_KEY_128};
-    use ikc_device::device_binding::bind_test;
-
-    #[test]
-    fn test_btc_fork_address() {
-        bind_test();
-        *XPUB_COMMON_KEY_128.write() = "4A2B655485ABBAB54BD30298BB0A5B55".to_string();
-        *XPUB_COMMON_IV.write() = "73518399CB98DCD114D873E06EBF4BCC".to_string();
-
-        let param = AddressParam {
-            chain_type: "NERVOS".to_string(),
-            path: "m/44'/309'/0'/0/0".to_string(),
-            network: "MAINNET".to_string(),
-            is_seg_wit: false,
-        };
-        let message = get_address(&param);
-    }
-}
diff --git a/imkey-core/ikc/src/substrate_address.rs b/imkey-core/ikc/src/substrate_address.rs
index 9c03541c..e608a0d6 100644
--- a/imkey-core/ikc/src/substrate_address.rs
+++ b/imkey-core/ikc/src/substrate_address.rs
@@ -2,7 +2,6 @@ use crate::api::{AddressParam, AddressResult};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use coin_substrate::address::{AddressType, SubstrateAddress};
-use prost::Message;
 
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let address_type = match param.chain_type.as_str() {
diff --git a/imkey-core/ikc/src/tron_address.rs b/imkey-core/ikc/src/tron_address.rs
index c798c5ea..0ceab267 100644
--- a/imkey-core/ikc/src/tron_address.rs
+++ b/imkey-core/ikc/src/tron_address.rs
@@ -2,7 +2,6 @@ use crate::api::{AddressParam, AddressResult};
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
 use coin_tron::address::TronAddress;
-use prost::Message;
 
 pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let address = TronAddress::get_address(param.path.as_ref())?;
diff --git a/imkey-core/mobile-sdk/android/imkeylibrary/src/main/proto/api.proto b/imkey-core/mobile-sdk/android/imkeylibrary/src/main/proto/api.proto
index 33bc7e40..2891a323 100755
--- a/imkey-core/mobile-sdk/android/imkeylibrary/src/main/proto/api.proto
+++ b/imkey-core/mobile-sdk/android/imkeylibrary/src/main/proto/api.proto
@@ -14,7 +14,7 @@ message ImkeyAction {
 }
 
 // A common response when error occurred.
-message Response {
+message GeneralResult {
     bool isSuccess = 1;
     string error = 2;
 }
\ No newline at end of file
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..695babab
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel="nightly-2023-06-15"
diff --git a/token-core/tcx-atom/Cargo.toml b/token-core/tcx-atom/Cargo.toml
new file mode 100644
index 00000000..8f413b8a
--- /dev/null
+++ b/token-core/tcx-atom/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "tcx-atom"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tcx-crypto = { path = "../tcx-crypto" }
+tcx-keystore = { path = "../tcx-keystore" }
+tcx-primitive = { path = "../tcx-primitive" }
+tcx-constants = { path = "../tcx-constants" }
+tcx-common = { path = "../tcx-common" }
+
+bech32 = "=0.9.1"
+anyhow = { version = "=1.0.79", features = [] }
+
+prost = "=0.11.2"
+bytes = "=1.4.0"
+base64 = "=0.13.1"
\ No newline at end of file
diff --git a/token-core/tcx-atom/src/address.rs b/token-core/tcx-atom/src/address.rs
new file mode 100644
index 00000000..3eee55f3
--- /dev/null
+++ b/token-core/tcx-atom/src/address.rs
@@ -0,0 +1,163 @@
+use core::str::FromStr;
+
+use bech32::{FromBase32, ToBase32, Variant};
+use tcx_common::{ripemd160, sha256};
+use tcx_constants::CoinInfo;
+use tcx_keystore::{Address, Result};
+use tcx_primitive::TypedPublicKey;
+
+// size of address
+pub const LENGTH: usize = 20;
+#[derive(PartialEq, Eq, Clone)]
+pub struct AtomAddress(String);
+
+impl Address for AtomAddress {
+    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<Self> {
+        let prefix = "cosmos";
+
+        let pub_key_bytes = public_key.to_bytes();
+        let mut bytes = [0u8; LENGTH];
+        let pub_key_hash = ripemd160(&sha256(&pub_key_bytes));
+        bytes.copy_from_slice(&pub_key_hash[..LENGTH]);
+
+        Ok(AtomAddress(bech32::encode(
+            prefix,
+            bytes.to_base32(),
+            Variant::Bech32,
+        )?))
+    }
+
+    fn is_valid(address: &str, _coin: &CoinInfo) -> bool {
+        let ret = bech32::decode(address);
+        if let Ok(val) = ret {
+            let (hrp, data, _) = val;
+            let data = Vec::from_base32(&data).unwrap();
+
+            if hrp.as_str() != "cosmos" {
+                return false;
+            }
+
+            if data.len() != 20 {
+                return false;
+            }
+            true
+        } else {
+            false
+        }
+    }
+}
+
+impl FromStr for AtomAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(AtomAddress(s.to_string()))
+    }
+}
+
+impl ToString for AtomAddress {
+    fn to_string(&self) -> String {
+        self.0.clone()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::address::AtomAddress;
+    use std::str::FromStr;
+    use tcx_keystore::Address;
+
+    use tcx_common::FromHex;
+    use tcx_constants::{CoinInfo, CurveType};
+    use tcx_primitive::{TypedPrivateKey, TypedPublicKey};
+
+    fn get_test_coin() -> CoinInfo {
+        CoinInfo {
+            coin: "COSMOS".to_string(),
+            derivation_path: "m/44'/118'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+        }
+    }
+
+    #[test]
+    fn test_pubkey_to_address() {
+        let test_cases = vec![
+            (
+                "037a525043e79a9051d58214a9a2a70b657b3d49124dcd0acc4730df5f35d74b32",
+                "cosmos1pt9904aqg739q6p9kgc2v0puqvj6atp0zsj70g",
+            ),
+            (
+                "02ba66a84cf7839af172a13e7fc9f5e7008cb8bca1585f8f3bafb3039eda3c1fdd",
+                "cosmos1r5v5srda7xfth3hn2s26txvrcrntldjumt8mhl",
+            ),
+        ];
+
+        for (sec_key, expected_addr) in test_cases {
+            let pub_key =
+                TypedPublicKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(sec_key).unwrap())
+                    .unwrap();
+
+            let addr = AtomAddress::from_public_key(&pub_key, &get_test_coin()).unwrap();
+            assert_eq!(addr.to_string(), expected_addr);
+        }
+    }
+
+    #[test]
+    fn test_address_is_valid() {
+        let invalid_addresses = vec![
+            "ckt1qyqd5eyygtdmwdr7ge736zw6z0ju6wsw7rssu8fcve",
+            "ckb1qyqdmeuqrsrnm7e5vnrmruzmsp4m9wacf6vsxasryq",
+        ];
+        for addr in invalid_addresses {
+            assert!(!AtomAddress::is_valid(addr, &get_test_coin()));
+        }
+
+        let valid_addresses = vec![
+            "cosmos1r5v5srda7xfth3hn2s26txvrcrntldjumt8mhl",
+            "cosmos1pt9904aqg739q6p9kgc2v0puqvj6atp0zsj70g",
+        ];
+        for addr in valid_addresses {
+            assert!(AtomAddress::is_valid(addr, &get_test_coin()));
+        }
+    }
+
+    #[test]
+    fn test_address_is_invalid() {
+        let valid_addresses = vec![
+            "cosmos1r5v5srda7xfth3hn2s26txvrcrntldjumt8mhll",
+            "cosmos1pt9904aqg739q6p9kgc2v0puqvj6atqxw0dax",
+        ];
+        for addr in valid_addresses {
+            assert!(!AtomAddress::is_valid(addr, &get_test_coin()));
+        }
+    }
+
+    #[test]
+    fn test_address_from_str() {
+        let address = "cosmos1r5v5srda7xfth3hn2s26txvrcrntldjumt8mhl";
+        let atom_address = AtomAddress::from_str(address).unwrap();
+        assert_eq!(atom_address.to_string(), address);
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let prv_str = "80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let coin_info = CoinInfo {
+            coin: "COSMOS".to_string(),
+            derivation_path: "m/44'/118'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let address = AtomAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    }
+}
diff --git a/token-core/tcx-atom/src/lib.rs b/token-core/tcx-atom/src/lib.rs
new file mode 100644
index 00000000..13e34b68
--- /dev/null
+++ b/token-core/tcx-atom/src/lib.rs
@@ -0,0 +1,11 @@
+pub mod address;
+pub mod signer;
+pub mod transaction;
+
+pub mod cosmos {
+    pub const CHAINS: [&str; 1] = ["COSMOS"];
+
+    pub type Address = crate::address::AtomAddress;
+    pub type TransactionInput = crate::transaction::AtomTxInput;
+    pub type TransactionOutput = crate::transaction::AtomTxOutput;
+}
diff --git a/token-core/tcx-atom/src/signer.rs b/token-core/tcx-atom/src/signer.rs
new file mode 100644
index 00000000..0fa6c860
--- /dev/null
+++ b/token-core/tcx-atom/src/signer.rs
@@ -0,0 +1,71 @@
+use crate::transaction::{AtomTxInput, AtomTxOutput};
+use tcx_keystore::{
+    Keystore, Result, SignatureParameters, Signer, TransactionSigner as TraitTransactionSigner,
+};
+
+use tcx_common::{sha256, FromHex};
+
+use base64;
+
+const SIG_LEN: usize = 64;
+
+impl TraitTransactionSigner<AtomTxInput, AtomTxOutput> for Keystore {
+    fn sign_transaction(
+        &mut self,
+        params: &SignatureParameters,
+        tx: &AtomTxInput,
+    ) -> Result<AtomTxOutput> {
+        let data = Vec::from_hex_auto(&tx.raw_data)?;
+        let hash = sha256(&data);
+
+        let sign_result =
+            self.secp256k1_ecdsa_sign_recoverable(&hash[..], &params.derivation_path)?;
+
+        Ok(AtomTxOutput {
+            signature: (base64::encode(&sign_result[..SIG_LEN])),
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tcx_constants::{CoinInfo, TEST_PASSWORD};
+    use tcx_constants::{CurveType, TEST_MNEMONIC};
+    use tcx_keystore::{HdKeystore, Keystore, KeystoreGuard, Metadata};
+
+    #[test]
+    fn test_sign_transaction() -> core::result::Result<(), anyhow::Error> {
+        let tx = AtomTxInput {
+            raw_data: "0a91010a8e010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126e0a2d636f736d6f733175616d6e346b74706d657332656664663671666837386d356365646b66637467617436657661122d636f736d6f73316a30636c726371727a636135326c6167707a3237687774713734776c327265353438346177681a0e0a057561746f6d1205313030303012680a510a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210232c1ef21d73c19531b0aa4e863cf397c2b982b2f958f60cdb62969824c096d6512040a02080118930312130a0d0a057561746f6d12043230303410b1f2041a0b636f736d6f736875622d34208cb201".to_string()
+        };
+
+        let meta = Metadata::default();
+        let mut keystore =
+            Keystore::Hd(HdKeystore::from_mnemonic(&TEST_MNEMONIC, &TEST_PASSWORD, meta).unwrap());
+
+        let _coin_info = CoinInfo {
+            coin: "COSMOS".to_string(),
+            derivation_path: "m/44'/118'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let mut guard = KeystoreGuard::unlock_by_password(&mut keystore, TEST_PASSWORD).unwrap();
+
+        let ks = guard.keystore_mut();
+
+        let sign_params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/118'/0'/0/0".to_string(),
+            chain_type: "COSMOS".to_string(),
+            ..Default::default()
+        };
+
+        let signed_tx: AtomTxOutput = ks.sign_transaction(&sign_params, &tx)?;
+
+        assert_eq!(signed_tx.signature, "355fWQ00dYitAZj6+EmnAgYEX1g7QtUrX/kQIqCbv05TCz0dfsWcMgXWVnr1l/I2hrjjQkiLRMoeRrmnqT2CZA==");
+
+        Ok(())
+    }
+}
diff --git a/token-core/tcx-atom/src/transaction.rs b/token-core/tcx-atom/src/transaction.rs
new file mode 100644
index 00000000..804da0a9
--- /dev/null
+++ b/token-core/tcx-atom/src/transaction.rs
@@ -0,0 +1,15 @@
+/// FUNCTION: sign_tx(SignParam{input: AtomTxInput}): AtomTxOutput
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AtomTxInput {
+    /// hex string
+    #[prost(string, tag = "1")]
+    pub raw_data: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AtomTxOutput {
+    /// hex string
+    #[prost(string, tag = "1")]
+    pub signature: ::prost::alloc::string::String,
+}
diff --git a/token-core/tcx-bch/Cargo.toml b/token-core/tcx-bch/Cargo.toml
deleted file mode 100644
index 9077b95f..00000000
--- a/token-core/tcx-bch/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "tcx-bch"
-version = "0.1.0"
-authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
-
-[dependencies]
-tcx-chain = { path = "../tcx-chain" }
-tcx-btc-fork = { path = "../tcx-btc-fork" }
-tcx-primitive = { path = "../tcx-primitive" }
-tcx-constants = { path = "../tcx-constants" }
-
-bch_addr = "0.1.0"
-bitcoin = "0.29.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-bip39 = "0.7.3"
-bitcoin_hashes = "0.11.0"
-#bitcoinconsensus = { version = "0.19.0-2", optional = true }
-failure = "0.1.8"
-hex = "0.4.3"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.88"
diff --git a/token-core/tcx-bch/src/lib.rs b/token-core/tcx-bch/src/lib.rs
deleted file mode 100644
index 243087a3..00000000
--- a/token-core/tcx-bch/src/lib.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use core::result;
-
-mod address;
-mod transaction;
-
-pub type Result<T> = result::Result<T, failure::Error>;
-
-#[macro_use]
-extern crate failure;
-
-pub use address::BchAddress;
-pub use transaction::BchTransaction;
-
-#[derive(Fail, Debug)]
-pub enum Error {
-    #[fail(display = "bch_convert_to_legacy_address_failed# address: {}", _0)]
-    ConvertToLegacyAddressFailed(String),
-    #[fail(display = "bch_convert_to_cash_address_failed# address: {}", _0)]
-    ConvertToCashAddressFailed(String),
-    #[fail(display = "construct_bch_address_failed# address: {}", _0)]
-    ConstructBchAddressFailed(String),
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::BchAddress;
-
-    use serde_json::Value;
-
-    use tcx_chain::KeystoreGuard;
-    use tcx_chain::{HdKeystore, Keystore, Metadata};
-    use tcx_constants::CurveType;
-    use tcx_constants::{CoinInfo, TEST_MNEMONIC, TEST_PASSWORD};
-
-    const BIP_PATH: &str = "m/44'/145'/0'";
-
-    #[test]
-    fn bch_create() {
-        let mut meta = Metadata::default();
-        meta.name = "CreateTest".to_string();
-
-        let mut keystore = Keystore::Hd(HdKeystore::new(TEST_PASSWORD, meta));
-
-        let bch_coin = CoinInfo {
-            coin: "BITCOINCASH".to_string(),
-            derivation_path: BIP_PATH.to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let mut guard = KeystoreGuard::unlock_by_password(&mut keystore, TEST_PASSWORD).unwrap();
-
-        let _ = guard
-            .keystore_mut()
-            .derive_coin::<BchAddress>(&bch_coin)
-            .unwrap();
-
-        let json_str = guard.keystore_mut().to_json();
-        let v: Value = serde_json::from_str(&json_str).unwrap();
-
-        let active_accounts = v["activeAccounts"].as_array().unwrap();
-        assert_eq!(1, active_accounts.len());
-        let account = active_accounts.first().unwrap();
-        let address = account["address"].as_str().unwrap();
-        assert!(!address.is_empty());
-        let path = account["derivationPath"].as_str().unwrap();
-        assert_eq!(BIP_PATH, path);
-        let coin = account["coin"].as_str().unwrap();
-        assert_eq!("BITCOINCASH", coin);
-    }
-
-    #[test]
-    fn bch_recover() {
-        let mut meta = Metadata::default();
-        meta.name = "RecoverTest".to_string();
-
-        let mut keystore =
-            Keystore::Hd(HdKeystore::from_mnemonic(&TEST_MNEMONIC, &TEST_PASSWORD, meta).unwrap());
-
-        let bch_coin = CoinInfo {
-            coin: "BITCOINCASH".to_string(),
-            derivation_path: BIP_PATH.to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-
-        let mut guard = KeystoreGuard::unlock_by_password(&mut keystore, TEST_PASSWORD).unwrap();
-
-        let _ = guard
-            .keystore_mut()
-            .derive_coin::<BchAddress>(&bch_coin)
-            .unwrap();
-        let json_str = guard.keystore_mut().to_json();
-        let v: Value = serde_json::from_str(&json_str).unwrap();
-
-        let active_accounts = v["activeAccounts"].as_array().unwrap();
-        assert_eq!(1, active_accounts.len());
-        let account = active_accounts.first().unwrap();
-        let address = account["address"].as_str().unwrap();
-
-        assert_eq!("qqyta3mqzeaxe8hqcdsgpy4srwd4f0fc0gj0njf885", address);
-
-        let path = account["derivationPath"].as_str().unwrap();
-        assert_eq!(BIP_PATH, path);
-        let coin = account["coin"].as_str().unwrap();
-        assert_eq!("BITCOINCASH", coin);
-    }
-}
diff --git a/token-core/tcx-bch/src/transaction.rs b/token-core/tcx-bch/src/transaction.rs
deleted file mode 100644
index 3c14cd41..00000000
--- a/token-core/tcx-bch/src/transaction.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use crate::address::BchAddress;
-use crate::Result;
-use bitcoin::Transaction;
-use std::str::FromStr;
-use tcx_btc_fork::bip143_with_forkid::SighashComponentsWithForkId;
-use tcx_btc_fork::signer::{LegacyTransactionSignComponent, SignHasher};
-use tcx_btc_fork::transaction::Utxo;
-use tcx_btc_fork::BitcoinForkSinger;
-use tcx_btc_fork::PubKeyScript;
-
-const BCH_FORK_ID: u32 = 0x41;
-
-pub struct BchSignHasher {}
-
-impl SignHasher for BchSignHasher {
-    fn sign_hash(
-        tx: &Transaction,
-        index: usize,
-        unspent: &Utxo,
-    ) -> Result<(bitcoin::hash_types::Sighash, u32)> {
-        let addr = BchAddress::from_str(&unspent.address)?;
-        let tx_in = &tx.input[index];
-        let script = addr.script_pub_key();
-        let shc = SighashComponentsWithForkId::new(&tx);
-        let hash = shc.sighash_all(tx_in, &script, unspent.amount as u64, BCH_FORK_ID);
-        Ok((hash, BCH_FORK_ID))
-    }
-}
-
-pub type BchTransaction =
-    BitcoinForkSinger<BchAddress, LegacyTransactionSignComponent<BchSignHasher>>;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::address::BchAddress;
-
-    use std::marker::PhantomData;
-    use std::str::FromStr;
-    use tcx_btc_fork::BtcForkTxInput;
-    use tcx_constants::coin_info::coin_info_from_param;
-    use tcx_primitive::{PrivateKey, Secp256k1PrivateKey};
-
-    #[test]
-    pub fn bch_signer() {
-        let utxo = Utxo {
-            tx_hash: "09c3a49c1d01f6341c43ea43dd0de571664a45b4e7d9211945cb3046006a98e2".to_string(),
-            vout: 0,
-            amount: 100000,
-            address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
-            script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derived_path: "1/0".to_string(),
-            sequence: 0,
-        };
-        let unspents = vec![utxo];
-        let input = BtcForkTxInput {
-            to: "qq40fskqshxem2gvz0xkf34ww3h6zwv4dcr7pm0z6s".to_string(),
-            amount: 93454,
-            unspents,
-            fee: 6000,
-            change_address_index: 1u32,
-            change_address: "".to_string(),
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("BITCOINCASH", "MAINNET", "NONE", "").unwrap();
-        let tran = BitcoinForkSinger::<BchAddress, LegacyTransactionSignComponent<BchSignHasher>> {
-            tx_input: input,
-            coin_info,
-            _marker_s: PhantomData,
-            _marker_t: PhantomData,
-        };
-
-        let prv_key = Secp256k1PrivateKey::from_slice(
-            &hex::decode("b0dabbf9ffed224fbca3b41a9e446b3d0b6240c6d2957197a8ab75bbf2e1a5d4")
-                .unwrap(),
-        )
-        .unwrap();
-
-        let change_addr =
-            BchAddress::from_str("qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r").unwrap();
-        let expected = tran
-            .sign_transaction(&vec![prv_key], change_addr.script_pub_key())
-            .unwrap();
-        assert_eq!(expected.signature, "0100000001e2986a004630cb451921d9e7b4454a6671e50ddd43ea431c34f6011d9ca4c309000000006a473044022064fb81c11181e6604aa56b29ed65e31680fc1203f5afb6f67c5437f2d68192d9022022282d6c3c35ffdf64a427df5e134aa0edb8528efb6151cb1c3b21422fdfd6e041210251492dfb299f21e426307180b577f927696b6df0b61883215f88eb9685d3d449ffffffff020e6d0100000000001976a9142af4c2c085cd9da90c13cd64c6ae746fa139956e88ac22020000000000001976a914bedf37acf35504c9bfd18b09d989d0fb23fd269688ac00000000");
-    }
-}
diff --git a/token-core/tcx-btc-fork/Cargo.toml b/token-core/tcx-btc-fork/Cargo.toml
deleted file mode 100644
index 284ad281..00000000
--- a/token-core/tcx-btc-fork/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "tcx-btc-fork"
-version = "0.1.0"
-authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
-
-[dependencies]
-tcx-crypto = { path = "../tcx-crypto" }
-tcx-chain = { path = "../tcx-chain" }
-tcx-primitive = { path = "../tcx-primitive" }
-tcx-constants = { path = "../tcx-constants" }
-
-hex = "0.4.3"
-base64 = "0.13.1"
-
-bitcoin = "0.29.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-bip39 = "0.7.3"
-bitcoin_hashes = "0.11.0"
-#bitcoinconsensus = { version = "0.19.0-2", optional = true }
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.88"
-uuid = { version = "1.2.2", features = ["serde", "v4"] }
-failure = "0.1.8"
-num-bigint = "0.4"
-num-traits = "0.2"
-num-integer = "0.1"
-byteorder = "1.4.3"
-bech32 = "0.9.1"
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
-
-
-[dev-dependencies]
-mockall = "0.11.3"
diff --git a/token-core/tcx-btc-fork/src/address.rs b/token-core/tcx-btc-fork/src/address.rs
deleted file mode 100644
index 16e24bf9..00000000
--- a/token-core/tcx-btc-fork/src/address.rs
+++ /dev/null
@@ -1,565 +0,0 @@
-use crate::signer::ScriptPubKeyComponent;
-use crate::Error;
-use crate::Result;
-
-use bech32::{u5, Variant};
-use bitcoin::hash_types::PubkeyHash as PubkeyHashType;
-use bitcoin::hash_types::ScriptHash as ScriptHashType;
-use bitcoin::network::constants::Network;
-use bitcoin::util::address::Payload;
-use bitcoin::util::address::{Error as BtcAddressError, WitnessVersion};
-use bitcoin::util::base58;
-use bitcoin::{Address as BtcAddress, Script};
-use bitcoin_hashes::Hash;
-use core::result;
-use std::convert::TryFrom;
-use std::fmt::{Display, Formatter};
-use std::str::FromStr;
-use tcx_chain::Address;
-use tcx_constants::btc_fork_network::{network_form_hrp, network_from_coin, BtcForkNetwork};
-use tcx_constants::coin_info::coin_info_from_param;
-use tcx_constants::CoinInfo;
-use tcx_primitive::{Ss58Codec, TypedPrivateKey, TypedPublicKey};
-// use bitcoin::hash_types::PubkeyHash;
-
-pub trait WifDisplay {
-    fn fmt(&self, coin_info: &CoinInfo) -> Result<String>;
-}
-
-impl WifDisplay for TypedPrivateKey {
-    fn fmt(&self, coin_info: &CoinInfo) -> Result<String> {
-        let network = network_from_coin(coin_info);
-        tcx_ensure!(network.is_some(), Error::UnsupportedChain);
-        // let typed_pk = TypedPrivateKey::from_slice(CurveType::SECP256k1, &data)?;
-        let key = self.as_secp256k1()?;
-        let version = vec![network.unwrap().private_prefix];
-        Ok(key.to_ss58check_with_version(&version))
-    }
-}
-
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct BtcForkAddress {
-    pub network: BtcForkNetwork,
-    pub payload: Payload,
-}
-
-impl Address for BtcForkAddress {
-    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<String> {
-        let network = network_from_coin(&coin);
-        tcx_ensure!(network.is_some(), Error::MissingNetwork);
-        let network = network.expect("network");
-
-        let addr = if coin.seg_wit.as_str() == "P2WPKH" {
-            BtcForkAddress::p2shwpkh(&public_key.to_bytes(), &network)?.to_string()
-        } else {
-            BtcForkAddress::p2pkh(&public_key.to_bytes(), &network)?.to_string()
-        };
-        Ok(addr.to_string())
-    }
-
-    fn is_valid(address: &str, coin: &CoinInfo) -> bool {
-        let ret = BtcForkAddress::from_str(address);
-        if ret.is_err() {
-            false
-        } else {
-            let addr: BtcForkAddress = ret.unwrap();
-            addr.network.network == coin.network
-        }
-    }
-}
-
-impl BtcForkAddress {
-    pub fn p2pkh(pub_key: &[u8], network: &BtcForkNetwork) -> Result<BtcForkAddress> {
-        let pub_key = bitcoin::PublicKey::from_slice(&pub_key)?;
-        let addr = BtcAddress::p2pkh(&pub_key, Network::Bitcoin);
-        Ok(BtcForkAddress {
-            payload: addr.payload,
-            network: network.clone(),
-        })
-    }
-
-    pub fn p2shwpkh(pub_key: &[u8], network: &BtcForkNetwork) -> Result<BtcForkAddress> {
-        let pub_key = bitcoin::PublicKey::from_slice(&pub_key)?;
-        let addr = BtcAddress::p2shwpkh(&pub_key, Network::Bitcoin)?;
-        Ok(BtcForkAddress {
-            payload: addr.payload,
-            network: network.clone(),
-        })
-    }
-
-    pub fn p2wpkh(pub_key: &[u8], network: &BtcForkNetwork) -> Result<BtcForkAddress> {
-        let pub_key = bitcoin::PublicKey::from_slice(&pub_key)?;
-        let addr = BtcAddress::p2wpkh(&pub_key, Network::Bitcoin)?;
-        Ok(BtcForkAddress {
-            payload: addr.payload,
-            network: network.clone(),
-        })
-    }
-
-    pub fn script_pubkey(&self) -> Script {
-        self.payload.script_pubkey()
-    }
-
-    pub fn address_like(target_addr: &str, pub_key: &[u8]) -> Result<BtcForkAddress> {
-        let target = BtcForkAddress::from_str(target_addr)?;
-        match target.payload {
-            Payload::PubkeyHash(_) => BtcForkAddress::p2pkh(pub_key, &target.network),
-            Payload::ScriptHash(_) => BtcForkAddress::p2shwpkh(pub_key, &target.network),
-            Payload::WitnessProgram {
-                version: _ver,
-                program: ref _prog,
-            } => BtcForkAddress::p2wpkh(pub_key, &target.network),
-        }
-    }
-
-    pub fn extended_public_key(
-        derivation_info: &impl Ss58Codec,
-        coin_info: &CoinInfo,
-    ) -> Result<String> {
-        let network = network_from_coin(&coin_info);
-        tcx_ensure!(network.is_some(), Error::UnsupportedChain);
-        Ok(derivation_info.to_ss58check_with_version(&network.unwrap().xpub_prefix))
-    }
-
-    pub fn extended_private_key(
-        extended_priv_key: &impl Ss58Codec,
-        coin_info: &CoinInfo,
-    ) -> Result<String> {
-        let network = network_from_coin(&coin_info);
-        tcx_ensure!(network.is_some(), Error::UnsupportedChain);
-        Ok(extended_priv_key.to_ss58check_with_version(&network.unwrap().xprv_prefix))
-    }
-}
-
-/// Extract the bech32 prefix.
-/// Returns the same slice when no prefix is found.
-fn bech32_network(bech32: &str) -> Option<BtcForkNetwork> {
-    let bech32_prefix = match bech32.rfind('1') {
-        None => None,
-        Some(sep) => Some(bech32.split_at(sep).0),
-    };
-    match bech32_prefix {
-        Some(prefix) => network_form_hrp(prefix),
-        None => None,
-    }
-}
-
-fn decode_base58(addr: &str) -> result::Result<Vec<u8>, BtcAddressError> {
-    // Base58
-    if addr.len() > 50 {
-        return Err(BtcAddressError::Base58(base58::Error::InvalidLength(
-            addr.len() * 11 / 15,
-        )));
-    }
-    let data = base58::from_check(&addr)?;
-    if data.len() != 21 {
-        Err(BtcAddressError::Base58(base58::Error::InvalidLength(
-            data.len(),
-        )))
-    } else {
-        Ok(data)
-    }
-}
-
-impl FromStr for BtcForkAddress {
-    type Err = BtcAddressError;
-
-    fn from_str(s: &str) -> result::Result<BtcForkAddress, BtcAddressError> {
-        // try bech32
-        let bech32_network = bech32_network(s);
-        if let Some(network) = bech32_network {
-            // decode as bech32
-            let (_, payload, _) = bech32::decode(s)?;
-            if payload.is_empty() {
-                return Err(BtcAddressError::EmptyBech32Payload);
-            }
-
-            // Get the script version and program (converted from 5-bit to 8-bit)
-            let (version, program): (bech32::u5, Vec<u8>) = {
-                let (v, p5) = payload.split_at(1);
-                (v[0], bech32::FromBase32::from_base32(p5)?)
-            };
-
-            // Generic segwit checks.
-            if version.to_u8() > 16 {
-                return Err(BtcAddressError::InvalidWitnessVersion(version.to_u8()));
-            }
-            if program.len() < 2 || program.len() > 40 {
-                return Err(BtcAddressError::InvalidWitnessProgramLength(program.len()));
-            }
-
-            // Specific segwit v0 check.
-            if version.to_u8() == 0 && (program.len() != 20 && program.len() != 32) {
-                return Err(BtcAddressError::InvalidSegwitV0ProgramLength(program.len()));
-            }
-            let payload = Payload::WitnessProgram {
-                version: WitnessVersion::try_from(version.to_u8())?,
-                program,
-            };
-            return Ok(BtcForkAddress { payload, network });
-        }
-
-        let data = decode_base58(s)?;
-        let (network, payload) = match data[0] {
-            0 => {
-                let coin_info = coin_info_from_param("BITCOIN", "MAINNET", "NONE", "")
-                    .expect("BtcForkNetwork coin_info");
-                (
-                    network_from_coin(&coin_info).expect("btc"),
-                    Payload::PubkeyHash(PubkeyHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            5 => {
-                let coin_info = coin_info_from_param("BITCOIN", "MAINNET", "P2WPKH", "")
-                    .expect("BITCOIN-P2WPKH coin_info");
-                (
-                    network_from_coin(&coin_info).expect("btc"),
-                    Payload::ScriptHash(ScriptHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            0x30 => {
-                let coin_info = coin_info_from_param("LITECOIN", "MAINNET", "NONE", "")
-                    .expect("LITECOIN coin_info");
-                (
-                    network_from_coin(&coin_info).expect("ltc-L"),
-                    Payload::PubkeyHash(PubkeyHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            0x32 => {
-                let coin_info = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "")
-                    .expect("LITECOIN-P2WPKH coin_info");
-                (
-                    network_from_coin(&coin_info).expect("ltc"),
-                    Payload::ScriptHash(ScriptHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            0x3a => {
-                let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "P2WPKH", "")
-                    .expect("LITECOIN TESTNET P2WPKH coin_info");
-                (
-                    network_from_coin(&coin_info).expect("ltc-testnet"),
-                    Payload::ScriptHash(ScriptHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            111 => {
-                let coin_info = coin_info_from_param("BITCOIN", "TESTNET", "NONE", "")
-                    .expect("BITCOIN-TESTNET coin_info");
-                (
-                    network_from_coin(&coin_info).expect("btc-testnet"),
-                    Payload::PubkeyHash(PubkeyHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            196 => {
-                let coin_info = coin_info_from_param("BITCOIN", "TESTNET", "P2WPKH", "")
-                    .expect("BITCOIN-TESTNET-P2WPKH coin_info");
-                (
-                    network_from_coin(&coin_info).expect("btc-testnet"),
-                    Payload::ScriptHash(ScriptHashType::from_slice(&data[1..]).unwrap()),
-                )
-            }
-            x => {
-                return Err(BtcAddressError::Base58(
-                    base58::Error::InvalidExtendedKeyVersion(<[u8; 4]>::try_from(vec![x]).unwrap()),
-                ));
-            }
-        };
-
-        Ok(BtcForkAddress { network, payload })
-    }
-}
-
-impl Display for BtcForkAddress {
-    fn fmt(&self, fmt: &mut Formatter) -> core::fmt::Result {
-        match self.payload {
-            Payload::PubkeyHash(ref hash) => {
-                let mut prefixed = [0; 21];
-                prefixed[0] = self.network.p2pkh_prefix;
-                prefixed[1..].copy_from_slice(&hash[..]);
-                base58::check_encode_slice_to_fmt(fmt, &prefixed[..])
-            }
-            Payload::ScriptHash(ref hash) => {
-                let mut prefixed = [0; 21];
-                prefixed[0] = self.network.p2sh_prefix;
-                prefixed[1..].copy_from_slice(&hash[..]);
-                base58::check_encode_slice_to_fmt(fmt, &prefixed[..])
-            }
-            Payload::WitnessProgram {
-                version: ver,
-                program: ref prog,
-            } => {
-                let hrp = self.network.hrp;
-                let mut bech32_writer = bech32::Bech32Writer::new(hrp, Variant::Bech32, fmt)?;
-                bech32::WriteBase32::write_u5(
-                    &mut bech32_writer,
-                    u5::try_from_u8(ver.to_num()).unwrap(),
-                )?;
-                bech32::ToBase32::write_base32(&prog, &mut bech32_writer)
-            }
-        }
-    }
-}
-
-pub trait PubKeyScript: Sized {
-    fn script_pub_key(&self) -> Script;
-}
-
-impl PubKeyScript for BtcForkAddress {
-    fn script_pub_key(&self) -> Script {
-        self.script_pubkey()
-    }
-}
-
-impl ScriptPubKeyComponent for BtcForkAddress {
-    fn address_script_like(target_addr: &str, pub_key: &bitcoin::PublicKey) -> Result<Script> {
-        let addr = BtcForkAddress::address_like(target_addr, &pub_key.to_bytes())?;
-        Ok(addr.script_pubkey())
-    }
-
-    fn address_script_pub_key(target_addr: &str) -> Result<Script> {
-        let addr = BtcForkAddress::from_str(target_addr)?;
-        Ok(addr.script_pubkey())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::address::BtcForkAddress;
-    use crate::signer::ScriptPubKeyComponent;
-    use crate::tcx_chain::Address;
-    use tcx_constants::coin_info::coin_info_from_param;
-
-    use std::str::FromStr;
-    use tcx_constants::btc_fork_network::network_from_param;
-
-    use tcx_constants::{CoinInfo, CurveType};
-    use tcx_primitive::{Bip32DeterministicPrivateKey, Derive, DeterministicPrivateKey, Ss58Codec};
-
-    #[test]
-    pub fn test_btc_fork_address() {
-        let pub_key_str = "02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba";
-        let pub_key = hex::decode(pub_key_str).unwrap();
-        let network = network_from_param("LITECOIN", "MAINNET", "NONE").unwrap();
-        let addr = BtcForkAddress::p2shwpkh(&pub_key, &network)
-            .unwrap()
-            .to_string();
-        assert_eq!(addr, "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW");
-
-        let network = network_from_param("LITECOIN", "MAINNET", "SEGWIT").unwrap();
-        let addr = BtcForkAddress::p2wpkh(&pub_key, &network)
-            .unwrap()
-            .to_string();
-        assert_eq!(addr, "ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf");
-
-        let network = network_from_param("BITCOIN", "MAINNET", "NONE").unwrap();
-        let addr = BtcForkAddress::p2shwpkh(&pub_key, &network)
-            .unwrap()
-            .to_string();
-        assert_eq!(addr, "3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG");
-
-        let network = network_from_param("BITCOIN", "MAINNET", "SEGWIT").unwrap();
-        let addr = BtcForkAddress::p2wpkh(&pub_key, &network)
-            .unwrap()
-            .to_string();
-        assert_eq!(addr, "bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e");
-    }
-
-    #[test]
-    pub fn test_btc_fork_address_from_str() {
-        let addr = BtcForkAddress::from_str("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW").unwrap();
-        assert_eq!(addr.network.coin, "LITECOIN");
-        assert_eq!(addr.network.seg_wit, "P2WPKH");
-        assert_eq!(addr.network.network, "MAINNET");
-        let addr = BtcForkAddress::from_str("ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf").unwrap();
-        assert_eq!(addr.network.coin, "LITECOIN");
-        assert_eq!(addr.network.seg_wit, "SEGWIT");
-        assert_eq!(addr.network.network, "MAINNET");
-
-        let addr = BtcForkAddress::from_str("3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG").unwrap();
-        assert_eq!(addr.network.coin, "BITCOIN");
-        assert_eq!(addr.network.seg_wit, "P2WPKH");
-        assert_eq!(addr.network.network, "MAINNET");
-        let addr = BtcForkAddress::from_str("bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e").unwrap();
-        assert_eq!(addr.network.coin, "BITCOIN");
-        assert_eq!(addr.network.seg_wit, "SEGWIT");
-        assert_eq!(addr.network.network, "MAINNET");
-        let addr = BtcForkAddress::from_str("12z6UzsA3tjpaeuvA2Zr9jwx19Azz74D6g").unwrap();
-        assert_eq!(addr.network.coin, "BITCOIN");
-        assert_eq!(addr.network.seg_wit, "NONE");
-        assert_eq!(addr.network.network, "MAINNET");
-
-        let addr = BtcForkAddress::from_str("2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB").unwrap();
-        assert_eq!(addr.network.coin, "BITCOIN");
-        assert_eq!(addr.network.seg_wit, "P2WPKH");
-        assert_eq!(addr.network.network, "TESTNET");
-    }
-
-    #[test]
-    pub fn test_address_like() {
-        let addr = BtcForkAddress::from_str("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW").unwrap();
-        let pub_key =
-            hex::decode("02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba")
-                .unwrap();
-        let liked_address = BtcForkAddress::address_like(&addr.to_string(), &pub_key)
-            .ok()
-            .unwrap();
-        assert_eq!(
-            "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW",
-            liked_address.to_string()
-        );
-
-        let addr = BtcForkAddress::from_str("ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf").unwrap();
-        let pub_key =
-            hex::decode("02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba")
-                .unwrap();
-        let liked_address = BtcForkAddress::address_like(&addr.to_string(), &pub_key)
-            .ok()
-            .unwrap();
-        assert_eq!(
-            "ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf",
-            liked_address.to_string()
-        );
-
-        let addr = BtcForkAddress::from_str("3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG").unwrap();
-        let pub_key =
-            hex::decode("02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba")
-                .unwrap();
-        let liked_address = BtcForkAddress::address_like(&addr.to_string(), &pub_key)
-            .ok()
-            .unwrap();
-        assert_eq!(
-            "3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG",
-            liked_address.to_string()
-        );
-
-        let addr = BtcForkAddress::from_str("bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e").unwrap();
-        let pub_key =
-            hex::decode("02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba")
-                .unwrap();
-        let liked_address = BtcForkAddress::address_like(&addr.to_string(), &pub_key)
-            .ok()
-            .unwrap();
-        assert_eq!(
-            "bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e",
-            liked_address.to_string()
-        );
-    }
-
-    #[test]
-    pub fn extended_private_key_test() {
-        let bitcoin_xprv_str = "xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ";
-        let anprv = Bip32DeterministicPrivateKey::from_ss58check(bitcoin_xprv_str).unwrap();
-        let coin_info = CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/44'/2'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let ltc_xprv_str = BtcForkAddress::extended_private_key(&anprv, &coin_info).unwrap();
-        assert_eq!("xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ", ltc_xprv_str);
-    }
-
-    #[test]
-    pub fn extended_public_key_test() {
-        let bitcoin_xprv_str = "xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ";
-        let anpub = Bip32DeterministicPrivateKey::from_ss58check(bitcoin_xprv_str)
-            .unwrap()
-            .derive("m/44'/2'/0'")
-            .unwrap()
-            .deterministic_public_key();
-        let coin_info = CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/44'/2'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let ltc_xprv_str = BtcForkAddress::extended_public_key(&anpub, &coin_info).unwrap();
-        assert_eq!("xpub6JeaAjhtvtjCDnEo4Bjr7uEbGccaHnJtLY4aBnMaAYGjkBRB3fP9XvjcCbNjMiU1n5tt7dYKVgHPGzh3t3W6eLBxavxABTaoQ2jhbiQrfe4", ltc_xprv_str);
-    }
-
-    #[test]
-    pub fn script_pub_key() {
-        let addr = BtcForkAddress::from_str("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW").unwrap();
-        let script = hex::encode(addr.script_pubkey().as_bytes());
-        assert_eq!("a914bc64b2d79807cd3d72101c3298b89117d32097fb87", script);
-
-        let addr = BtcForkAddress::from_str("ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf").unwrap();
-        let script = hex::encode(addr.script_pubkey().as_bytes());
-        assert_eq!("0014e6cfaab9a59ba187f0a45db0b169c21bb48f09b3", script);
-
-        let addr = BtcForkAddress::from_str("Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP").unwrap();
-        let script = hex::encode(addr.script_pubkey().as_bytes());
-        assert_eq!("76a914ca4d8acded69ce4f05d0925946d261f86c675fd888ac", script);
-
-        let addr = BtcForkAddress::from_str("3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG").unwrap();
-        let script = hex::encode(addr.script_pubkey().as_bytes());
-        assert_eq!("a914bc64b2d79807cd3d72101c3298b89117d32097fb87", script);
-    }
-
-    #[test]
-    pub fn script_pub_key_component_address_like_test() {
-        let _addr = BtcForkAddress::from_str("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW").unwrap();
-        let pub_key = bitcoin::PublicKey::from_str(
-            "02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba",
-        )
-        .unwrap();
-        let script =
-            BtcForkAddress::address_script_like("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW", &pub_key)
-                .unwrap();
-
-        let script = hex::encode(script.as_bytes());
-        assert_eq!("a914bc64b2d79807cd3d72101c3298b89117d32097fb87", script);
-
-        let script = BtcForkAddress::address_script_like(
-            "ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf",
-            &pub_key,
-        )
-        .unwrap();
-
-        let script = hex::encode(script.as_bytes());
-        assert_eq!("0014e6cfaab9a59ba187f0a45db0b169c21bb48f09b3", script);
-
-        let script =
-            BtcForkAddress::address_script_like("Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP", &pub_key)
-                .unwrap();
-
-        let script = hex::encode(script.as_bytes());
-        assert_eq!("76a914e6cfaab9a59ba187f0a45db0b169c21bb48f09b388ac", script);
-
-        let script =
-            BtcForkAddress::address_script_like("3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG", &pub_key)
-                .unwrap();
-
-        let script = hex::encode(script.as_bytes());
-        assert_eq!("a914bc64b2d79807cd3d72101c3298b89117d32097fb87", script);
-    }
-
-    #[test]
-    pub fn address_valid_test() {
-        let coin = coin_info_from_param("BITCOIN", "MAINNET", "P2WPKH", "").unwrap();
-        assert!(BtcForkAddress::is_valid(
-            "3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG",
-            &coin
-        ));
-        let coin = coin_info_from_param("LITECOIN", "MAINNET", "NONE", "").unwrap();
-        assert!(BtcForkAddress::is_valid(
-            "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP",
-            &coin
-        ));
-        let coin = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "").unwrap();
-        assert!(BtcForkAddress::is_valid(
-            "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW",
-            &coin
-        ));
-
-        let coin = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "").unwrap();
-        assert!(!BtcForkAddress::is_valid(
-            "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDf",
-            &coin
-        ));
-
-        let coin = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "").unwrap();
-        assert!(!BtcForkAddress::is_valid("aaa", &coin));
-    }
-}
diff --git a/token-core/tcx-btc-fork/src/bip143_with_forkid.rs b/token-core/tcx-btc-fork/src/bip143_with_forkid.rs
deleted file mode 100644
index 18c6d5c7..00000000
--- a/token-core/tcx-btc-fork/src/bip143_with_forkid.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use bitcoin_hashes::{sha256d, Hash};
-
-use bitcoin::blockdata::script::Script;
-use bitcoin::blockdata::transaction::{Transaction, TxIn};
-use bitcoin::consensus::encode::Encodable;
-use std::io::Cursor;
-
-/// Parts of a sighash which are common across inputs or signatures, and which are
-/// sufficient (in conjunction with a private key) to sign the transaction
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct SighashComponentsWithForkId {
-    tx_version: i32,
-    tx_locktime: u32,
-    /// Hash of all the previous outputs
-    pub hash_prevouts: sha256d::Hash,
-    /// Hash of all the input sequence nos
-    pub hash_sequence: sha256d::Hash,
-    /// Hash of all the outputs in this transaction
-    pub hash_outputs: sha256d::Hash,
-}
-
-impl SighashComponentsWithForkId {
-    /// Compute the sighash components from an unsigned transaction and auxiliary
-    /// information about its inputs.
-    /// For the generated sighashes to be valid, no fields in the transaction may change except for
-    /// script_sig and witnesses.
-    pub fn new(tx: &Transaction) -> SighashComponentsWithForkId {
-        let hash_prevouts = {
-            let mut enc = sha256d::Hash::engine();
-            for txin in &tx.input {
-                txin.previous_output.consensus_encode(&mut enc).unwrap();
-            }
-            sha256d::Hash::from_engine(enc)
-        };
-
-        let hash_sequence = {
-            let mut enc = sha256d::Hash::engine();
-            for txin in &tx.input {
-                txin.sequence.consensus_encode(&mut enc).unwrap();
-            }
-            sha256d::Hash::from_engine(enc)
-        };
-
-        let hash_outputs = {
-            let mut enc = sha256d::Hash::engine();
-            for txout in &tx.output {
-                txout.consensus_encode(&mut enc).unwrap();
-            }
-            sha256d::Hash::from_engine(enc)
-        };
-
-        SighashComponentsWithForkId {
-            tx_version: tx.version,
-            tx_locktime: tx.lock_time.to_u32(),
-            hash_prevouts,
-            hash_sequence,
-            hash_outputs,
-        }
-    }
-
-    /// Compute the BIP143 sighash for a `SIGHASH_ALL` signature for the given
-    /// input.
-    pub fn sighash_all(
-        &self,
-        txin: &TxIn,
-        witness_script: &Script,
-        value: u64,
-        fork_id: u32,
-    ) -> bitcoin::hash_types::Sighash {
-        let mut enc = sha256d::Hash::engine();
-        let mut encoder: Cursor<Vec<u8>> = Cursor::new(vec![]);
-        self.tx_version.consensus_encode(&mut enc).unwrap();
-        self.tx_version.consensus_encode(&mut encoder).unwrap();
-
-        self.hash_prevouts.consensus_encode(&mut enc).unwrap();
-        self.hash_prevouts.consensus_encode(&mut encoder).unwrap();
-        self.hash_sequence.consensus_encode(&mut enc).unwrap();
-        self.hash_sequence.consensus_encode(&mut encoder).unwrap();
-        txin.previous_output.consensus_encode(&mut enc).unwrap();
-        txin.previous_output.consensus_encode(&mut encoder).unwrap();
-        witness_script.consensus_encode(&mut enc).unwrap();
-        witness_script.consensus_encode(&mut encoder).unwrap();
-        value.consensus_encode(&mut enc).unwrap();
-        value.consensus_encode(&mut encoder).unwrap();
-        txin.sequence.consensus_encode(&mut enc).unwrap();
-        txin.sequence.consensus_encode(&mut encoder).unwrap();
-        self.hash_outputs.consensus_encode(&mut enc).unwrap();
-        self.hash_outputs.consensus_encode(&mut encoder).unwrap();
-        self.tx_locktime.consensus_encode(&mut enc).unwrap();
-        self.tx_locktime.consensus_encode(&mut encoder).unwrap();
-        fork_id.consensus_encode(&mut enc).unwrap(); // hashtype
-        fork_id.consensus_encode(&mut encoder).unwrap(); // hashtype
-        bitcoin::hash_types::Sighash::hash(&encoder.into_inner())
-    }
-}
diff --git a/token-core/tcx-btc-fork/src/lib.rs b/token-core/tcx-btc-fork/src/lib.rs
deleted file mode 100644
index 463509c0..00000000
--- a/token-core/tcx-btc-fork/src/lib.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-pub mod address;
-pub mod bip143_with_forkid;
-pub mod signer;
-pub mod transaction;
-
-use core::result;
-use serde::{Deserialize, Serialize};
-
-#[macro_use]
-extern crate failure;
-
-extern crate num_bigint;
-extern crate num_integer;
-extern crate num_traits;
-
-#[macro_use]
-extern crate tcx_chain;
-
-pub type Result<T> = result::Result<T, failure::Error>;
-
-pub use signer::{BitcoinForkSinger, BtcForkSegWitTransaction, BtcForkTransaction};
-pub use transaction::{BtcForkSignedTxOutput, BtcForkTxInput, Utxo};
-
-pub use address::{BtcForkAddress, PubKeyScript, WifDisplay};
-pub use signer::ScriptPubKeyComponent;
-
-#[derive(Fail, Debug)]
-pub enum Error {
-    #[fail(display = "decrypt_xpub_error")]
-    DecryptXPubError,
-    #[fail(display = "unsupported_chain")]
-    UnsupportedChain,
-    #[fail(display = "missing_network")]
-    MissingNetwork,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct ExternalAddress {
-    pub address: String,
-    #[serde(rename = "type")]
-    pub addr_type: String,
-    pub derived_path: String,
-}
diff --git a/token-core/tcx-btc-fork/src/signer.rs b/token-core/tcx-btc-fork/src/signer.rs
deleted file mode 100644
index 938b9fcd..00000000
--- a/token-core/tcx-btc-fork/src/signer.rs
+++ /dev/null
@@ -1,871 +0,0 @@
-use tcx_chain::{Keystore, TransactionSigner};
-
-use bitcoin::{
-    LockTime, OutPoint, PackedLockTime, Script, Sequence, Transaction, TxIn, TxOut, Witness,
-};
-// use bitcoin_hashes::sha256d::Hash as Hash256;
-// use bitcoin_hashes::{sha256d, Hash};
-use bitcoin_hashes::Hash;
-
-use crate::Result;
-use bitcoin::blockdata::script::Builder;
-use bitcoin::consensus::serialize;
-use std::str::FromStr;
-
-use crate::address::BtcForkAddress;
-use crate::transaction::{BtcForkSignedTxOutput, BtcForkTxInput, Utxo};
-use bitcoin::util::bip143::SighashComponents;
-use bitcoin_hashes::hash160;
-use bitcoin_hashes::hex::FromHex as HashFromHex;
-use bitcoin_hashes::hex::ToHex as HashToHex;
-use std::marker::PhantomData;
-use tcx_chain::Address;
-use tcx_constants::CoinInfo;
-use tcx_primitive::{
-    Bip32DeterministicPublicKey, Derive, DeterministicPublicKey, FromHex, PrivateKey, PublicKey,
-    TypedDeterministicPublicKey,
-};
-
-const DUST: u64 = 546;
-const SIGHASH_ALL: u8 = 0x01;
-
-pub trait ScriptPubKeyComponent {
-    fn address_script_like(target_addr: &str, pub_key: &bitcoin::PublicKey) -> Result<Script>;
-    fn address_script_pub_key(target_addr: &str) -> Result<Script>;
-}
-
-pub struct BitcoinForkSinger<S: ScriptPubKeyComponent + Address, T: BitcoinTransactionSignComponent>
-{
-    pub tx_input: BtcForkTxInput,
-    pub coin_info: CoinInfo,
-    pub _marker_s: PhantomData<S>,
-    pub _marker_t: PhantomData<T>,
-}
-
-impl<S: ScriptPubKeyComponent + Address, T: BitcoinTransactionSignComponent>
-    TransactionSigner<BitcoinForkSinger<S, T>, BtcForkSignedTxOutput> for Keystore
-{
-    fn sign_transaction(
-        &mut self,
-        symbol: &str,
-        address: &str,
-        tx: &BitcoinForkSinger<S, T>,
-    ) -> Result<BtcForkSignedTxOutput> {
-        let change_address = if self.determinable() {
-            let dpk = self.find_deterministic_public_key(symbol, address)?;
-            tx.change_address(&dpk)?
-        } else {
-            S::address_script_pub_key(&address)?
-        };
-
-        let mut sks = vec![];
-
-        for x in tx.tx_input.unspents.iter() {
-            if x.derived_path.len() > 0 {
-                sks.push(
-                    self.find_private_key_by_path(symbol, address, &x.derived_path)?
-                        .as_secp256k1()?
-                        .clone(),
-                );
-            } else {
-                sks.push(
-                    self.find_private_key(symbol, &x.address)?
-                        .as_secp256k1()?
-                        .clone(),
-                );
-            }
-        }
-
-        tx.sign_transaction(&sks, change_address)
-    }
-}
-
-impl<S: ScriptPubKeyComponent + Address, T: BitcoinTransactionSignComponent>
-    BitcoinForkSinger<S, T>
-{
-    pub fn new(input: BtcForkTxInput, coin: CoinInfo) -> Self {
-        BitcoinForkSinger::<S, T> {
-            tx_input: input,
-            coin_info: coin,
-            _marker_s: PhantomData,
-            _marker_t: PhantomData,
-        }
-    }
-
-    fn receive_script_pubkey(&self) -> Result<Script> {
-        S::address_script_pub_key(&self.tx_input.to)
-    }
-
-    fn change_address(&self, dpk: &TypedDeterministicPublicKey) -> Result<Script> {
-        if !self.tx_input.change_address.is_empty() {
-            S::address_script_pub_key(&self.tx_input.change_address)
-        } else {
-            let from = &self.tx_input.unspents.first().expect("first_utxo").address;
-            // todo: address is error
-            let _change_path = format!("1/{}", &self.tx_input.change_address_index);
-            let pub_key = dpk.public_key().as_secp256k1()?.0;
-            S::address_script_like(&from, &pub_key)
-        }
-    }
-
-    pub fn derive_pub_key_at_path(xpub: &str, child_path: &str) -> Result<bitcoin::PublicKey> {
-        let epk = Bip32DeterministicPublicKey::from_hex(xpub)?;
-
-        let index_ext_pub_key = epk.derive(child_path)?;
-
-        Ok(index_ext_pub_key.public_key().0)
-    }
-
-    fn tx_outs(&self, change_script_pubkey: Script) -> Result<Vec<TxOut>> {
-        let mut total_amount = 0;
-
-        for unspent in &self.tx_input.unspents {
-            total_amount += unspent.amount;
-        }
-
-        ensure!(
-            self.tx_input.amount >= DUST as i64,
-            "amount_less_than_minimum"
-        );
-
-        ensure!(
-            total_amount >= (self.tx_input.amount + self.tx_input.fee),
-            "total amount must ge amount + fee"
-        );
-
-        let mut tx_outs: Vec<TxOut> = vec![];
-
-        let receive_script_pubkey = self.receive_script_pubkey()?;
-        let receiver_tx_out = TxOut {
-            value: self.tx_input.amount as u64,
-            script_pubkey: receive_script_pubkey,
-        };
-        tx_outs.push(receiver_tx_out);
-        let change_amount = total_amount - self.tx_input.amount - self.tx_input.fee;
-
-        if change_amount >= DUST as i64 {
-            let change_tx_out = TxOut {
-                value: change_amount as u64,
-                script_pubkey: change_script_pubkey,
-            };
-            tx_outs.push(change_tx_out);
-        }
-        Ok(tx_outs)
-    }
-
-    fn tx_inputs(&self) -> Vec<TxIn> {
-        let mut tx_inputs: Vec<TxIn> = vec![];
-
-        for unspent in &self.tx_input.unspents {
-            tx_inputs.push(TxIn {
-                previous_output: OutPoint {
-                    txid: bitcoin::hash_types::Txid::from_hex(&unspent.tx_hash).expect("tx_hash"),
-                    vout: unspent.vout as u32,
-                },
-                script_sig: Script::new(),
-                sequence: Sequence::MAX,
-                witness: Witness::default(),
-            });
-        }
-        tx_inputs
-    }
-
-    pub fn sign_transaction(
-        &self,
-        keys: &[impl PrivateKey],
-        change_addr_pubkey: Script,
-    ) -> Result<BtcForkSignedTxOutput> {
-        let tx_outs = self.tx_outs(change_addr_pubkey)?;
-        let tx_inputs = self.tx_inputs();
-        let tx = Transaction {
-            version: T::tx_version(),
-            lock_time: PackedLockTime::ZERO,
-            input: tx_inputs,
-            output: tx_outs,
-        };
-
-        let signed_tx = T::sign_inputs(&tx, &self.tx_input.unspents, &keys)?;
-        let tx_bytes = serialize(&signed_tx);
-
-        Ok(BtcForkSignedTxOutput {
-            signature: tx_bytes.to_hex(),
-            tx_hash: signed_tx.txid().into_inner().to_hex(),
-        })
-    }
-}
-
-pub trait BitcoinTransactionSignComponent {
-    fn sign_inputs(
-        tx: &Transaction,
-        unspents: &[Utxo],
-        keys: &[impl PrivateKey],
-    ) -> Result<Transaction>;
-    fn tx_version() -> i32;
-
-    fn sign_hash_and_pub_key(
-        pri_key: &impl PrivateKey,
-        hash: &[u8],
-        sign_hash: u8,
-    ) -> Result<(Vec<u8>, Vec<u8>)> {
-        let signature_bytes = pri_key.sign(&hash)?;
-        let raw_bytes: Vec<u8> = vec![sign_hash];
-        let sig_bytes: Vec<u8> = [signature_bytes, raw_bytes].concat();
-        let pub_key = pri_key.public_key();
-        let pub_key_bytes = pub_key.to_bytes();
-        Ok((sig_bytes, pub_key_bytes.to_vec()))
-    }
-}
-
-pub struct SegWitTransactionSignComponent {}
-
-impl SegWitTransactionSignComponent {
-    fn witness_sign(
-        tx: &Transaction,
-        unspents: &[Utxo],
-        keys: &[impl PrivateKey],
-    ) -> Result<Vec<(Vec<u8>, Vec<u8>)>> {
-        let mut witnesses: Vec<(Vec<u8>, Vec<u8>)> = vec![];
-        let shc = SighashComponents::new(&tx);
-        for i in 0..tx.input.len() {
-            let tx_in = &tx.input[i];
-            let unspent = &unspents[i];
-            let pub_key = &keys[i].public_key();
-            let pub_key_bytes = pub_key.to_bytes();
-            let pub_key_hash = hash160::Hash::hash(&pub_key_bytes).into_inner();
-            let script_hex = format!("76a914{}88ac", hex::encode(pub_key_hash));
-            let script = Script::from(hex::decode(script_hex)?);
-            let hash = shc.sighash_all(tx_in, &script, unspent.amount as u64);
-
-            let prv_key = &keys[i];
-            witnesses.push(Self::sign_hash_and_pub_key(
-                prv_key,
-                &hash.into_inner(),
-                SIGHASH_ALL,
-            )?);
-        }
-        Ok(witnesses)
-    }
-}
-
-impl BitcoinTransactionSignComponent for SegWitTransactionSignComponent {
-    fn sign_inputs(
-        tx: &Transaction,
-        unspents: &[Utxo],
-        keys: &[impl PrivateKey],
-    ) -> Result<Transaction> {
-        let witnesses: Vec<(Vec<u8>, Vec<u8>)> = Self::witness_sign(tx, unspents, keys)?;
-        let input_with_sigs = tx
-            .input
-            .iter()
-            .enumerate()
-            .map(|(i, txin)| {
-                let pub_key = &keys[i].public_key();
-                let pub_key_bytes = pub_key.to_bytes();
-                let hash = hash160::Hash::hash(&pub_key_bytes).into_inner();
-                let hex = format!("160014{}", hex::encode(&hash));
-
-                TxIn {
-                    script_sig: Script::from(hex::decode(hex).expect("script_sig")),
-                    witness: Witness::from_vec(vec![
-                        witnesses[i].0.clone(),
-                        witnesses[i].1.clone(),
-                    ]),
-                    ..*txin
-                }
-            })
-            .collect();
-        Ok(Transaction {
-            version: Self::tx_version(),
-            lock_time: tx.lock_time,
-            input: input_with_sigs,
-            output: tx.output.clone(),
-        })
-    }
-
-    fn tx_version() -> i32 {
-        2
-    }
-}
-
-pub struct LegacyTransactionSignComponent<H: SignHasher> {
-    _maker: PhantomData<H>,
-}
-
-pub trait SignHasher {
-    fn sign_hash(
-        tx: &Transaction,
-        index: usize,
-        unspent: &Utxo,
-    ) -> Result<(bitcoin::hash_types::Sighash, u32)>;
-}
-
-pub struct LegacySignHasher {}
-
-impl SignHasher for LegacySignHasher {
-    fn sign_hash(
-        tx: &Transaction,
-        index: usize,
-        unspent: &Utxo,
-    ) -> Result<(bitcoin::hash_types::Sighash, u32)> {
-        let addr = BtcForkAddress::from_str(&unspent.address)?;
-        let script = addr.script_pubkey();
-        let hash = tx.signature_hash(index, &script, u32::from(SIGHASH_ALL));
-        Ok((hash, u32::from(SIGHASH_ALL)))
-    }
-}
-
-impl<H: SignHasher> LegacyTransactionSignComponent<H> {
-    fn script_sigs_sign(
-        tx: &Transaction,
-        unspents: &[Utxo],
-        keys: &[impl PrivateKey],
-    ) -> Result<Vec<Script>> {
-        let mut script_sigs: Vec<Script> = vec![];
-
-        for i in 0..tx.input.len() {
-            let unspent = &unspents[i];
-            let (hash, hash_type) = H::sign_hash(&tx, i, &unspent)?;
-            let prv_key = &keys[i];
-            let script_sig_and_pub_key =
-                Self::sign_hash_and_pub_key(prv_key, &hash.into_inner(), hash_type as u8)?;
-            let script = Builder::new()
-                .push_slice(&script_sig_and_pub_key.0)
-                .push_slice(&script_sig_and_pub_key.1)
-                .into_script();
-            script_sigs.push(script);
-        }
-        Ok(script_sigs)
-    }
-}
-
-impl<H: SignHasher> BitcoinTransactionSignComponent for LegacyTransactionSignComponent<H> {
-    fn sign_inputs(
-        tx: &Transaction,
-        unspents: &[Utxo],
-        keys: &[impl PrivateKey],
-    ) -> Result<Transaction> {
-        let sign_scripts = Self::script_sigs_sign(&tx, unspents, &keys)?;
-        let input_with_sigs = tx
-            .input
-            .iter()
-            .enumerate()
-            .map(|(i, txin)| TxIn {
-                script_sig: sign_scripts[i].clone(),
-                witness: Witness::default(),
-                ..*txin
-            })
-            .collect();
-        Ok(Transaction {
-            version: Self::tx_version(),
-            lock_time: tx.lock_time,
-            input: input_with_sigs,
-            output: tx.output.clone(),
-        })
-    }
-
-    fn tx_version() -> i32 {
-        1
-    }
-}
-
-pub type BtcForkTransaction =
-    BitcoinForkSinger<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>>;
-
-pub type BtcForkSegWitTransaction =
-    BitcoinForkSinger<BtcForkAddress, SegWitTransactionSignComponent>;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use super::BitcoinForkSinger;
-    use tcx_chain::{Keystore, TransactionSigner};
-    use tcx_constants::coin_info::coin_info_from_param;
-    use tcx_primitive::Secp256k1PrivateKey;
-
-    #[test]
-    fn test_sign_ltc() {
-        let unspents = vec![Utxo {
-            tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-            script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derived_path: "0/0".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "mrU9pEmAx26HcbKVrABvgL7AwA5fjNFoDc".to_string(),
-            amount: 500000,
-            unspents,
-            fee: 100000,
-            change_address_index: 1u32,
-            change_address: "".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let prv_key =
-            Secp256k1PrivateKey::from_wif("cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY")
-                .unwrap();
-        let change_addr = BtcForkAddress::from_str("mgBCJAsvzgT2qNNeXsoECg2uPKrUsZ76up").unwrap();
-        let expected = tran
-            .sign_transaction(&vec![prv_key], change_addr.script_pubkey())
-            .unwrap();
-        assert_eq!(expected.signature, "01000000015884e5db9de218238671572340b207ee85b628074e7e467096c267266baf77a4000000006a473044022029063983b2537e4aa15ee838874269a6ba6f5280297f92deb5cd56d2b2db7e8202207e1581f73024a48fce1100ed36a1a48f6783026736de39a4dd40a1ccc75f651101210223078d2942df62c45621d209fab84ea9a7a23346201b7727b9b45a29c4e76f5effffffff0220a10700000000001976a9147821c0a3768aa9d1a37e16cf76002aef5373f1a888ac801a0600000000001976a914073b7eae2823efa349e3b9155b8a735526463a0f88ac00000000");
-    }
-
-    #[test]
-    fn test_sign_ltc_from_keystore() {
-        let keystore_json = r#"
-        {"id":"ae45d424-31d8-49f7-a601-1272b40c566d","version":11000,"keyHash":"512115eca3ae86646aeb06861d551e403b543509","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},"ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},"mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},"activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],"imTokenMeta":{"name":"LTC-Wallet-1","passwordHint":"","timestamp":1576561805,"source":"MNEMONIC"}}
-        "#;
-        let unspents = vec![Utxo {
-            tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            script_pub_key: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derived_path: "0/0".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
-            amount: 100000,
-            unspents,
-            fee: 5902,
-            change_address_index: 1u32,
-            change_address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let mut keystore = Keystore::from_json(keystore_json).unwrap();
-        let _ = keystore.unlock_by_password("imtoken1");
-        let expected = keystore
-            .sign_transaction("LITECOIN", "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN", &tran)
-            .unwrap();
-        assert_eq!(
-            expected.tx_hash,
-            "f90dd185c2a14fa29b9644f4087eecf64fd87d5c60f8e36f790054a4b55450e1"
-        );
-        assert_eq!(expected.signature, "010000000101a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006b48304502210090beb741ec38b0931a457c40086ba183c0cc85542bce5e5811a2377e954a113b022029a37ba9ccfe57fc77f639c7599d4fcf35f2fb921a610967a88dba0a800ee9ae0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff02a0860100000000001976a914461bf9360ec1bc9fe438df19ef36c7c2bb26ef8288ac92a40d00000000001976a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac00000000");
-    }
-
-    #[test]
-    fn test_sign_ltc_multi_utxo() {
-        let keystore_json = r#"
-        {"id":"ae45d424-31d8-49f7-a601-1272b40c566d","version":11000,"keyHash":"512115eca3ae86646aeb06861d551e403b543509","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},"ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},"mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},"activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],"imTokenMeta":{"name":"LTC-Wallet-1","passwordHint":"","timestamp":1576561805,"source":"MNEMONIC"}}
-        "#;
-        let unspents = vec![
-            Utxo {
-                tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101"
-                    .to_string(),
-                vout: 0,
-                amount: 1000000,
-                address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-                script_pub_key: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-                derived_path: "0/0".to_string(),
-                sequence: 0,
-            },
-            Utxo {
-                tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a100"
-                    .to_string(),
-                vout: 0,
-                amount: 1000000,
-                address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-                script_pub_key: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-                derived_path: "0/0".to_string(),
-                sequence: 0,
-            },
-        ];
-        let tx_input = BtcForkTxInput {
-            to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
-            amount: 1100000,
-            unspents,
-            fee: 5902,
-            change_address_index: 1u32,
-            change_address: "".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let mut keystore = Keystore::from_json(keystore_json).unwrap();
-        let _ = keystore.unlock_by_password("imtoken1");
-        let expected = keystore
-            .sign_transaction("LITECOIN", "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN", &tran)
-            .unwrap();
-        assert_eq!(
-            expected.tx_hash,
-            "1d95b4e3cac9b81fb9459799cb6c7ffc38b5b78ee38fdcfdb972dc17f77db761"
-        );
-        assert_eq!(expected.signature, "010000000201a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006a47304402202b007c693e784805eaae1e68a35d8d4a15331a29aa19a27fecd5a530cd6bba95022000dfa238c90a5a48c66817e0a0a69e275d159e566c1eb661b6c362b249f8aa510121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff00a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006a4730440220320b151cab9701c0e031310e4c7e6ff4712b291b79bee2a7f20bd2acd40a5a93022030fc72cf9f2f66aa5d88d97ef0e3c537dfa11f9d1ef6cac7bd68e45d3cb410700121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff02e0c81000000000001976a914461bf9360ec1bc9fe438df19ef36c7c2bb26ef8288ac92a40d00000000001976a9145ec105a23edc97d73a8de1e49d498684c40aa84988ac00000000");
-    }
-
-    #[test]
-    fn test_wrong_derived_path() {
-        let keystore_json = r#"
-        {"id":"ae45d424-31d8-49f7-a601-1272b40c566d","version":11000,"keyHash":"512115eca3ae86646aeb06861d551e403b543509","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},"ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},"mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},"activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],"imTokenMeta":{"name":"LTC-Wallet-1","passwordHint":"","timestamp":1576561805,"source":"MNEMONIC"}}
-        "#;
-        let unspents = vec![Utxo {
-            tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            script_pub_key: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derived_path: "0/1".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
-            amount: 100000,
-            unspents,
-            fee: 5902,
-            change_address_index: 1u32,
-            change_address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let mut keystore = Keystore::from_json(keystore_json).unwrap();
-        let _ = keystore.unlock_by_password("imtoken1");
-        let expected = keystore
-            .sign_transaction("LITECOIN", "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN", &tran)
-            .unwrap();
-        assert_ne!(
-            expected.tx_hash,
-            "f90dd185c2a14fa29b9644f4087eecf64fd87d5c60f8e36f790054a4b55450e1"
-        );
-        assert_ne!(expected.signature, "010000000101a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006b48304502210090beb741ec38b0931a457c40086ba183c0cc85542bce5e5811a2377e954a113b022029a37ba9ccfe57fc77f639c7599d4fcf35f2fb921a610967a88dba0a800ee9ae0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff02a0860100000000001976a914461bf9360ec1bc9fe438df19ef36c7c2bb26ef8288ac92a40d00000000001976a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac00000000");
-    }
-
-    #[test]
-    fn test_invalid_derived_path() {
-        let keystore_json = r#"
-        {"id":"ae45d424-31d8-49f7-a601-1272b40c566d","version":11000,"keyHash":"512115eca3ae86646aeb06861d551e403b543509","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},"ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},"mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},"activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],"imTokenMeta":{"name":"LTC-Wallet-1","passwordHint":"","timestamp":1576561805,"source":"MNEMONIC"}}
-        "#;
-        let unspents = vec![Utxo {
-            tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            script_pub_key: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derived_path: "hello//ggg".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
-            amount: 100000,
-            unspents,
-            fee: 5902,
-            change_address_index: 1u32,
-            change_address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let mut keystore = Keystore::from_json(keystore_json).unwrap();
-        let _ = keystore.unlock_by_password("imtoken1");
-        let ret =
-            keystore.sign_transaction("LITECOIN", "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN", &tran);
-        assert!(ret.is_err());
-        assert_eq!(
-            format!("{}", ret.err().unwrap()),
-            "invalid child number format"
-        );
-    }
-
-    #[test]
-    fn test_sign_ltc_invalid_unspent_address() {
-        let keystore_json = r#"
-        {"id":"ae45d424-31d8-49f7-a601-1272b40c566d","version":11000,"keyHash":"512115eca3ae86646aeb06861d551e403b543509","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},"ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},"mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},"activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],"imTokenMeta":{"name":"LTC-Wallet-1","passwordHint":"","timestamp":1576561805,"source":"MNEMONIC"}}
-        "#;
-        let unspents = vec![Utxo {
-            tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "address_invalid".to_string(),
-            script_pub_key: "76a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac".to_string(),
-            derived_path: "0/0".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
-            amount: 100000,
-            unspents,
-            fee: 5902,
-            change_address_index: 1u32,
-            change_address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let mut keystore = Keystore::from_json(keystore_json).unwrap();
-        let _ = keystore.unlock_by_password("imtoken1");
-        let ret =
-            keystore.sign_transaction("LITECOIN", "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN", &tran);
-        assert!(ret.is_err());
-    }
-
-    #[test]
-    fn test_sign_ltc_amount_great_than_unspents() {
-        // amount great than unspents
-        let unspents = vec![Utxo {
-            tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-            script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derived_path: "0/0".to_string(),
-            sequence: 0,
-        }];
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tx_input = BtcForkTxInput {
-            to: "mrU9pEmAx26HcbKVrABvgL7AwA5fjNFoDc".to_string(),
-            amount: 1500000,
-            unspents,
-            fee: 100000,
-            change_address_index: 1u32,
-            change_address: "".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let prv_key =
-            Secp256k1PrivateKey::from_wif("cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY")
-                .unwrap();
-        let change_addr = BtcForkAddress::from_str("mgBCJAsvzgT2qNNeXsoECg2uPKrUsZ76up").unwrap();
-        let ret = tran.sign_transaction(&vec![prv_key], change_addr.script_pubkey());
-        assert!(ret.is_err());
-        assert_eq!(
-            format!("{}", ret.err().unwrap()),
-            "total amount must ge amount + fee"
-        );
-    }
-
-    #[test]
-    fn test_sign_ltc_amount_less_than_dust() {
-        // amount great than unspents
-        let unspents = vec![Utxo {
-            tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-            script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derived_path: "0/0".to_string(),
-            sequence: 0,
-        }];
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tx_input = BtcForkTxInput {
-            to: "mrU9pEmAx26HcbKVrABvgL7AwA5fjNFoDc".to_string(),
-            amount: 545,
-            unspents,
-            fee: 100000,
-            change_address_index: 1u32,
-            change_address: "".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let prv_key =
-            Secp256k1PrivateKey::from_wif("cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY")
-                .unwrap();
-        let change_addr = BtcForkAddress::from_str("mgBCJAsvzgT2qNNeXsoECg2uPKrUsZ76up").unwrap();
-        let ret = tran.sign_transaction(&vec![prv_key], change_addr.script_pubkey());
-        assert!(ret.is_err());
-        assert_eq!(
-            format!("{}", ret.err().unwrap()),
-            "amount_less_than_minimum"
-        );
-    }
-
-    #[test]
-    fn test_sign_ltc_invalid_ltc_to_address() {
-        let chain_types = vec!["BITCOINCASH", "LITECOIN"];
-        for chain_type in chain_types {
-            let unspents = vec![Utxo {
-                tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458"
-                    .to_string(),
-                vout: 0,
-                amount: 1000000,
-                address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-                script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-                derived_path: "0/0".to_string(),
-                sequence: 0,
-            }];
-            let coin_info = coin_info_from_param(chain_type, "TESTNET", "NONE", "").unwrap();
-            let tx_input = BtcForkTxInput {
-                to: "address_invalid".to_string(),
-                amount: 500000,
-                unspents,
-                fee: 100000,
-                change_address_index: 1u32,
-                change_address: "".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "NONE".to_string(),
-            };
-            let tran = BitcoinForkSinger::<
-                BtcForkAddress,
-                LegacyTransactionSignComponent<LegacySignHasher>,
-            > {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-            let prv_key = Secp256k1PrivateKey::from_wif(
-                "cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY",
-            )
-            .unwrap();
-            let change_addr =
-                BtcForkAddress::from_str("mgBCJAsvzgT2qNNeXsoECg2uPKrUsZ76up").unwrap();
-            let ret = tran.sign_transaction(&vec![prv_key], change_addr.script_pubkey());
-            assert!(ret.is_err());
-        }
-    }
-
-    #[test]
-    fn test_sign_ltc_change_address() {
-        let unspents = vec![Utxo {
-            tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458".to_string(),
-            vout: 0,
-            amount: 1000000,
-            address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-            script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derived_path: "0/0".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "mrU9pEmAx26HcbKVrABvgL7AwA5fjNFoDc".to_string(),
-            amount: 500000,
-            unspents,
-            fee: 100000,
-            change_address_index: 0,
-            change_address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
-        let tran =
-            BitcoinForkSinger::<BtcForkAddress, LegacyTransactionSignComponent<LegacySignHasher>> {
-                tx_input,
-                coin_info,
-                _marker_s: PhantomData,
-                _marker_t: PhantomData,
-            };
-
-        let prv_key =
-            Secp256k1PrivateKey::from_wif("cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY")
-                .unwrap();
-        let change_addr = BtcForkAddress::from_str("mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1").unwrap();
-        let actual = tran
-            .sign_transaction(&vec![prv_key], change_addr.script_pubkey())
-            .unwrap();
-        assert_eq!(actual.signature, "01000000015884e5db9de218238671572340b207ee85b628074e7e467096c267266baf77a4000000006b483045022100eefdd6cace70ee64d6a29bca5f52c338b2b3ecf6e6c7b222818c9bba60f094fb022053535e23a77afc7255c18ae8c6e6bf0f8b6e3f552d08519455714cbe59e489cf01210223078d2942df62c45621d209fab84ea9a7a23346201b7727b9b45a29c4e76f5effffffff0220a10700000000001976a9147821c0a3768aa9d1a37e16cf76002aef5373f1a888ac801a0600000000001976a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac00000000");
-    }
-
-    #[test]
-    fn test_sign_segwit_ltc() {
-        let unspents = vec![Utxo {
-            tx_hash: "e868b66e75376add2154acb558cf45ff7b723f255e2aca794da1548eb945ba8b".to_string(),
-            vout: 1,
-            amount: 19850000,
-            address: "MV3hqxhhcGxCdeLXpZKRCabtUApRXixgid".to_string(),
-            script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac".to_string(),
-            derived_path: "1/0".to_string(),
-            sequence: 0,
-        }];
-        let tx_input = BtcForkTxInput {
-            to: "M7xo1Mi1gULZSwgvu7VVEvrwMRqngmFkVd".to_string(),
-            amount: 19800000,
-            unspents,
-            fee: 50000,
-            change_address_index: 1u32,
-            change_address: "".to_string(),
-            network: "".to_string(),
-            seg_wit: "".to_string(),
-        };
-        let coin_info = coin_info_from_param("LITECOIN", "MAINNET", "NONE", "").unwrap();
-        let tran = BitcoinForkSinger::<BtcForkAddress, SegWitTransactionSignComponent> {
-            tx_input,
-            coin_info,
-            _marker_s: PhantomData,
-            _marker_t: PhantomData,
-        };
-
-        let pair = Secp256k1PrivateKey::from_slice(
-            &hex::decode("f3731f49d830c109e054522df01a9378383814af5b01a9cd150511f12db39e6e")
-                .unwrap(),
-        )
-        .unwrap();
-
-        let change_addr = BtcForkAddress::from_str("MV3hqxhhcGxCdeLXpZKRCabtUApRXixgid").unwrap();
-        let expected = tran
-            .sign_transaction(&vec![pair], change_addr.script_pubkey())
-            .unwrap();
-        assert_eq!(expected.signature, "020000000001018bba45b98e54a14d79ca2a5e253f727bff45cf58b5ac5421dd6a37756eb668e801000000171600147b03478d2f7c984179084baa38f790ed1d37629bffffffff01c01f2e010000000017a91400aff21f24bc08af58e41e4186d8492a10b84f9e8702483045022100d0cc3d94c7b7b34fdcc2adc4fd3f735560407581afd6caa11c8d04b963a048a00220777d98e0122fe97206875f49556a401dfc449739ec30e44cb9ed9b92a0b3ff1b01210209c629c64829ec2e99703600ee86c7161a9ed13213e714726210274c29cf780900000000");
-    }
-}
diff --git a/token-core/tcx-btc-fork/src/transaction.rs b/token-core/tcx-btc-fork/src/transaction.rs
deleted file mode 100644
index 6d94edfa..00000000
--- a/token-core/tcx-btc-fork/src/transaction.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-/// FUNCTION: sign_tx(SignParam{input: BtcForkTxInput}): BtcForkSignedTxOutput
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Utxo {
-    #[prost(string, tag = "1")]
-    pub tx_hash: ::prost::alloc::string::String,
-    #[prost(int32, tag = "2")]
-    pub vout: i32,
-    #[prost(int64, tag = "3")]
-    pub amount: i64,
-    #[prost(string, tag = "4")]
-    pub address: ::prost::alloc::string::String,
-    #[prost(string, tag = "5")]
-    pub script_pub_key: ::prost::alloc::string::String,
-    #[prost(string, tag = "6")]
-    pub derived_path: ::prost::alloc::string::String,
-    #[prost(int64, tag = "7")]
-    pub sequence: i64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BtcForkTxInput {
-    #[prost(string, tag = "1")]
-    pub to: ::prost::alloc::string::String,
-    #[prost(int64, tag = "2")]
-    pub amount: i64,
-    #[prost(message, repeated, tag = "3")]
-    pub unspents: ::prost::alloc::vec::Vec<Utxo>,
-    #[prost(int64, tag = "4")]
-    pub fee: i64,
-    #[prost(uint32, tag = "5")]
-    pub change_address_index: u32,
-    #[prost(string, tag = "6")]
-    pub change_address: ::prost::alloc::string::String,
-    #[prost(string, tag = "7")]
-    pub network: ::prost::alloc::string::String,
-    #[prost(string, tag = "8")]
-    pub seg_wit: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BtcForkSignedTxOutput {
-    #[prost(string, tag = "1")]
-    pub signature: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub tx_hash: ::prost::alloc::string::String,
-}
diff --git a/token-core/tcx-btc-kin/Cargo.toml b/token-core/tcx-btc-kin/Cargo.toml
new file mode 100644
index 00000000..9fe6f3a3
--- /dev/null
+++ b/token-core/tcx-btc-kin/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "tcx-btc-kin"
+version = "0.1.0"
+authors = ["Neal Xu <imxuneal@gmail.com>"]
+edition = "2021"
+
+[dependencies]
+tcx-crypto = { path = "../tcx-crypto" }
+tcx-keystore = { path = "../tcx-keystore" }
+tcx-primitive = { path = "../tcx-primitive" }
+tcx-constants = { path = "../tcx-constants" }
+tcx-common = { path = "../tcx-common" }
+
+hex = "=0.4.3"
+base64 = "=0.13.1"
+
+bitcoin = "=0.29.2"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery", "rand-std"] }
+tiny-bip39 = "=1.0.0"
+bitcoin_hashes = "=0.11.0"
+#bitcoinconsensus = { version = "0.19.0-2", optional = true }
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+uuid = { version = "=1.2.2", features = ["serde", "v4"] }
+anyhow = { version = "=1.0.79", features = [] }
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+num-integer = "=0.1.45"
+byteorder = "=1.4.3"
+bech32 = "=0.9.1"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
+bch_addr = "=0.1.0"
+thiserror = "=1.0.56"
+
+[dev-dependencies]
+mockall = "=0.11.3"
diff --git a/token-core/tcx-btc-fork/README.md b/token-core/tcx-btc-kin/README.md
similarity index 100%
rename from token-core/tcx-btc-fork/README.md
rename to token-core/tcx-btc-kin/README.md
diff --git a/token-core/tcx-btc-kin/src/address.rs b/token-core/tcx-btc-kin/src/address.rs
new file mode 100644
index 00000000..e8cd6058
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/address.rs
@@ -0,0 +1,522 @@
+use core::result;
+use std::convert::TryFrom;
+use std::fmt::{Display, Formatter};
+use std::str::FromStr;
+
+use bitcoin::hash_types::PubkeyHash as PubkeyHashType;
+use bitcoin::hash_types::ScriptHash as ScriptHashType;
+use bitcoin::network::constants::Network;
+use bitcoin::schnorr::UntweakedPublicKey;
+use bitcoin::util::address::Payload;
+use bitcoin::util::address::{Error as LibAddressError, WitnessVersion};
+use bitcoin::util::base58;
+use bitcoin::util::key::PublicKey;
+use bitcoin::{Address as LibAddress, Script};
+use bitcoin_hashes::Hash;
+use secp256k1::Secp256k1;
+
+use tcx_constants::CoinInfo;
+use tcx_keystore::Address;
+use tcx_primitive::{Ss58Codec, TypedPrivateKey, TypedPublicKey};
+
+use crate::network::BtcKinNetwork;
+use crate::Error;
+use crate::Result;
+
+pub trait WIFDisplay {
+    fn fmt(&self, coin_info: &CoinInfo) -> Result<String>;
+}
+
+pub trait ScriptPubkey {
+    fn script_pubkey(&self) -> Script;
+}
+
+impl WIFDisplay for TypedPrivateKey {
+    fn fmt(&self, coin_info: &CoinInfo) -> Result<String> {
+        let network = BtcKinNetwork::find_by_coin(&coin_info.coin, &coin_info.network);
+        tcx_ensure!(network.is_some(), Error::UnsupportedChain);
+
+        let key = self.as_secp256k1()?;
+        let version = vec![network.unwrap().private_prefix];
+        Ok(key.to_ss58check_with_version(&version))
+    }
+}
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct BtcKinAddress {
+    pub network: BtcKinNetwork,
+    pub payload: Payload,
+}
+
+impl Address for BtcKinAddress {
+    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<Self> {
+        let network = BtcKinNetwork::find_by_coin(&coin.coin, &coin.network);
+        tcx_ensure!(network.is_some(), Error::MissingNetwork);
+        let network = network.unwrap();
+
+        let address = match coin.seg_wit.as_str() {
+            "P2WPKH" => BtcKinAddress::p2shwpkh(&public_key.to_bytes(), network)?,
+            "VERSION_0" => BtcKinAddress::p2wpkh(&public_key.to_bytes(), network)?,
+            "VERSION_1" => BtcKinAddress::p2tr(&public_key.to_bytes(), network)?,
+            _ => BtcKinAddress::p2pkh(&public_key.to_bytes(), network)?,
+        };
+
+        Ok(address)
+    }
+
+    fn is_valid(address: &str, coin: &CoinInfo) -> bool {
+        let ret = BtcKinAddress::from_str(address);
+        if let Ok(btc_kin_addr) = ret {
+            btc_kin_addr.network.network == coin.network
+        } else {
+            false
+        }
+    }
+}
+
+impl BtcKinAddress {
+    pub fn p2pkh(pub_key: &[u8], network: &BtcKinNetwork) -> Result<BtcKinAddress> {
+        let pub_key = PublicKey::from_slice(pub_key)?;
+        let addr = LibAddress::p2pkh(&pub_key, Network::Bitcoin);
+
+        Ok(BtcKinAddress {
+            payload: addr.payload,
+            network: network.clone(),
+        })
+    }
+
+    pub fn p2shwpkh(pub_key: &[u8], network: &BtcKinNetwork) -> Result<BtcKinAddress> {
+        let pub_key = PublicKey::from_slice(pub_key)?;
+        let addr = LibAddress::p2shwpkh(&pub_key, Network::Bitcoin)?;
+
+        Ok(BtcKinAddress {
+            payload: addr.payload,
+            network: network.clone(),
+        })
+    }
+
+    pub fn p2wpkh(pub_key: &[u8], network: &BtcKinNetwork) -> Result<BtcKinAddress> {
+        let pub_key = PublicKey::from_slice(pub_key)?;
+        let addr = LibAddress::p2wpkh(&pub_key, Network::Bitcoin)?;
+        Ok(BtcKinAddress {
+            payload: addr.payload,
+            network: network.clone(),
+        })
+    }
+
+    pub fn p2tr(pub_key: &[u8], network: &BtcKinNetwork) -> Result<BtcKinAddress> {
+        let pub_key = UntweakedPublicKey::from(secp256k1::PublicKey::from_slice(pub_key)?);
+        let secp256k1 = Secp256k1::new();
+        let addr = LibAddress::p2tr(&secp256k1, pub_key, None, Network::Bitcoin);
+        Ok(BtcKinAddress {
+            payload: addr.payload,
+            network: network.clone(),
+        })
+    }
+
+    pub fn script_pubkey(&self) -> Script {
+        self.payload.script_pubkey()
+    }
+
+    pub fn extended_public_key(
+        derivation_info: &impl Ss58Codec,
+        coin_info: &CoinInfo,
+    ) -> Result<String> {
+        let network = BtcKinNetwork::find_by_coin(&coin_info.coin, &coin_info.network);
+        tcx_ensure!(network.is_some(), Error::UnsupportedChain);
+        Ok(derivation_info.to_ss58check_with_version(&network.unwrap().xpub_prefix))
+    }
+
+    pub fn extended_private_key(
+        extended_priv_key: &impl Ss58Codec,
+        coin_info: &CoinInfo,
+    ) -> Result<String> {
+        let network = BtcKinNetwork::find_by_coin(&coin_info.coin, &coin_info.network);
+        tcx_ensure!(network.is_some(), Error::UnsupportedChain);
+        Ok(extended_priv_key.to_ss58check_with_version(&network.unwrap().xprv_prefix))
+    }
+}
+
+fn bech32_network(bech32: &str) -> Option<&BtcKinNetwork> {
+    let bech32_prefix = bech32.rfind('1').map(|sep| bech32.split_at(sep).0);
+
+    match bech32_prefix {
+        Some(prefix) => BtcKinNetwork::find_by_hrp(prefix),
+        None => None,
+    }
+}
+
+fn decode_base58(addr: &str) -> result::Result<Vec<u8>, LibAddressError> {
+    // Base58
+    if addr.len() > 50 {
+        return Err(LibAddressError::Base58(base58::Error::InvalidLength(
+            addr.len() * 11 / 15,
+        )));
+    }
+    let data = base58::from_check(addr)?;
+    if data.len() != 21 {
+        Err(LibAddressError::Base58(base58::Error::InvalidLength(
+            data.len(),
+        )))
+    } else {
+        Ok(data)
+    }
+}
+
+impl ScriptPubkey for BtcKinAddress {
+    fn script_pubkey(&self) -> Script {
+        self.script_pubkey()
+    }
+}
+
+impl FromStr for BtcKinAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<BtcKinAddress> {
+        // try bech32
+        let bech32_network = bech32_network(s);
+        if let Some(network) = bech32_network {
+            // decode as bech32
+            let (_, payload, _) = bech32::decode(s)?;
+            if payload.is_empty() {
+                return Err(LibAddressError::EmptyBech32Payload.into());
+            }
+
+            // Get the script version and program (converted from 5-bit to 8-bit)
+            let (version, program): (bech32::u5, Vec<u8>) = {
+                let (v, p5) = payload.split_at(1);
+                (v[0], bech32::FromBase32::from_base32(p5)?)
+            };
+
+            // Generic segwit checks.
+            if version.to_u8() > 16 {
+                return Err(LibAddressError::InvalidWitnessVersion(version.to_u8()).into());
+            }
+            if program.len() < 2 || program.len() > 40 {
+                return Err(LibAddressError::InvalidWitnessProgramLength(program.len()).into());
+            }
+
+            // Specific segwit v0 check.
+            if version.to_u8() == 0 && (program.len() != 20 && program.len() != 32) {
+                return Err(LibAddressError::InvalidSegwitV0ProgramLength(program.len()).into());
+            }
+            let payload = Payload::WitnessProgram {
+                version: WitnessVersion::try_from(version.to_u8())?,
+                program,
+            };
+            return Ok(BtcKinAddress {
+                payload,
+                network: network.clone(),
+            });
+        }
+
+        let data = decode_base58(s).map_err(|_| Error::InvalidAddress)?;
+        if let Some(network) = BtcKinNetwork::find_by_prefix(data[0]) {
+            if network.p2pkh_prefix == data[0] {
+                return Ok(BtcKinAddress {
+                    network: network.clone(),
+                    payload: Payload::PubkeyHash(PubkeyHashType::from_slice(&data[1..]).unwrap()),
+                });
+            } else if network.p2sh_prefix == data[0] {
+                return Ok(BtcKinAddress {
+                    network: network.clone(),
+                    payload: Payload::ScriptHash(ScriptHashType::from_slice(&data[1..]).unwrap()),
+                });
+            }
+        }
+
+        Err(LibAddressError::UnrecognizedScript.into())
+    }
+}
+
+impl Display for BtcKinAddress {
+    fn fmt(&self, fmt: &mut Formatter) -> core::fmt::Result {
+        match self.payload {
+            Payload::PubkeyHash(ref hash) => {
+                let mut prefixed = [0; 21];
+                prefixed[0] = self.network.p2pkh_prefix;
+                prefixed[1..].copy_from_slice(&hash[..]);
+                base58::check_encode_slice_to_fmt(fmt, &prefixed[..])
+            }
+            Payload::ScriptHash(ref hash) => {
+                let mut prefixed = [0; 21];
+                prefixed[0] = self.network.p2sh_prefix;
+                prefixed[1..].copy_from_slice(&hash[..]);
+                base58::check_encode_slice_to_fmt(fmt, &prefixed[..])
+            }
+            Payload::WitnessProgram {
+                version,
+                program: ref prog,
+            } => {
+                let mut bech32_writer = bech32::Bech32Writer::new(
+                    self.network.bech32_hrp,
+                    version.bech32_variant(),
+                    fmt,
+                )?;
+                bech32::WriteBase32::write_u5(&mut bech32_writer, version.into())?;
+                bech32::ToBase32::write_base32(&prog, &mut bech32_writer)
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::str::FromStr;
+    use tcx_common::{FromHex, ToHex};
+
+    use tcx_constants::coin_info::coin_info_from_param;
+    use tcx_constants::{CoinInfo, CurveType};
+    use tcx_primitive::{
+        Bip32DeterministicPrivateKey, Derive, DeterministicPrivateKey, Ss58Codec, TypedPrivateKey,
+        TypedPublicKey,
+    };
+
+    use crate::address::BtcKinAddress;
+    use crate::tcx_keystore::Address;
+    use crate::BtcKinNetwork;
+
+    #[test]
+    fn test_btc_kin_address() {
+        let pub_key_str = "02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba";
+        let pub_key = Vec::from_hex(pub_key_str).unwrap();
+        let network = BtcKinNetwork::find_by_coin("LITECOIN", "MAINNET").unwrap();
+        let addr = BtcKinAddress::p2shwpkh(&pub_key, &network)
+            .unwrap()
+            .to_string();
+        assert_eq!(addr, "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW");
+
+        let network = BtcKinNetwork::find_by_coin("LITECOIN", "MAINNET").unwrap();
+        let addr = BtcKinAddress::p2wpkh(&pub_key, &network)
+            .unwrap()
+            .to_string();
+        assert_eq!(addr, "ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf");
+
+        let network = BtcKinNetwork::find_by_coin("BITCOIN", "MAINNET").unwrap();
+        let addr = BtcKinAddress::p2shwpkh(&pub_key, &network)
+            .unwrap()
+            .to_string();
+        assert_eq!(addr, "3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG");
+
+        let network = BtcKinNetwork::find_by_coin("BITCOIN", "MAINNET").unwrap();
+        let addr = BtcKinAddress::p2wpkh(&pub_key, &network)
+            .unwrap()
+            .to_string();
+        assert_eq!(addr, "bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e");
+    }
+
+    #[test]
+    fn test_btc_kin_address_from_str() {
+        let addr = BtcKinAddress::from_str("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW").unwrap();
+        assert_eq!(addr.network.coin, "LITECOIN");
+        assert_eq!(addr.network.network, "MAINNET");
+
+        let addr = BtcKinAddress::from_str("ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf").unwrap();
+        assert_eq!(addr.network.coin, "LITECOIN");
+        assert_eq!(addr.network.network, "MAINNET");
+
+        let addr = BtcKinAddress::from_str("3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG").unwrap();
+        assert_eq!(addr.network.coin, "BITCOIN");
+        assert_eq!(addr.network.network, "MAINNET");
+
+        let addr = BtcKinAddress::from_str("bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e").unwrap();
+        assert_eq!(addr.network.coin, "BITCOIN");
+        assert_eq!(addr.network.network, "MAINNET");
+
+        let addr = BtcKinAddress::from_str("12z6UzsA3tjpaeuvA2Zr9jwx19Azz74D6g").unwrap();
+        assert_eq!(addr.network.coin, "BITCOIN");
+        assert_eq!(addr.network.network, "MAINNET");
+
+        let addr = BtcKinAddress::from_str("2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB").unwrap();
+        assert_eq!(addr.network.coin, "BITCOIN");
+        assert_eq!(addr.network.network, "TESTNET");
+    }
+
+    #[test]
+    fn test_extended_private_key() {
+        let bitcoin_xprv_str = "xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ";
+        let anprv = Bip32DeterministicPrivateKey::from_ss58check(bitcoin_xprv_str).unwrap();
+        let coin_info = CoinInfo {
+            coin: "LITECOIN".to_string(),
+            derivation_path: "m/44'/2'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let ltc_xprv_str = BtcKinAddress::extended_private_key(&anprv, &coin_info).unwrap();
+        assert_eq!("xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ", ltc_xprv_str);
+    }
+
+    #[test]
+    fn test_extended_public_key() {
+        let bitcoin_xprv_str = "xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ";
+        let anpub = Bip32DeterministicPrivateKey::from_ss58check(bitcoin_xprv_str)
+            .unwrap()
+            .derive("m/44'/2'/0'")
+            .unwrap()
+            .deterministic_public_key();
+        let coin_info = CoinInfo {
+            coin: "LITECOIN".to_string(),
+            derivation_path: "m/44'/2'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let ltc_xprv_str = BtcKinAddress::extended_public_key(&anpub, &coin_info).unwrap();
+        assert_eq!("xpub6JeaAjhtvtjCDnEo4Bjr7uEbGccaHnJtLY4aBnMaAYGjkBRB3fP9XvjcCbNjMiU1n5tt7dYKVgHPGzh3t3W6eLBxavxABTaoQ2jhbiQrfe4", ltc_xprv_str);
+    }
+
+    #[test]
+    fn test_script_pubkey() {
+        let addr = BtcKinAddress::from_str("MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW").unwrap();
+        let script = addr.script_pubkey().as_bytes().to_hex();
+        assert_eq!("a914bc64b2d79807cd3d72101c3298b89117d32097fb87", script);
+
+        let addr = BtcKinAddress::from_str("ltc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdn08yddf").unwrap();
+        let script = addr.script_pubkey().as_bytes().to_hex();
+        assert_eq!("0014e6cfaab9a59ba187f0a45db0b169c21bb48f09b3", script);
+
+        let addr = BtcKinAddress::from_str("Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP").unwrap();
+        let script = addr.script_pubkey().as_bytes().to_hex();
+        assert_eq!("76a914ca4d8acded69ce4f05d0925946d261f86c675fd888ac", script);
+
+        let addr = BtcKinAddress::from_str("3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG").unwrap();
+        let script = addr.script_pubkey().as_bytes().to_hex();
+        assert_eq!("a914bc64b2d79807cd3d72101c3298b89117d32097fb87", script);
+    }
+
+    #[test]
+    fn test_invalid_address() {
+        //Bad base58 checksum
+        let r = BtcKinAddress::from_str("34xp4vRoCGJym3xR7yCVPFHoCNxv4Twseo3");
+        assert_eq!(r.err().unwrap().to_string(), "invalid_address");
+
+        let r = BtcKinAddress::from_str("4MfAagS5MczC4DjH6RdV26nekvuXmhfBJq5MBWzv7nBnB73DMjst2");
+        assert_eq!(r.err().unwrap().to_string(), "invalid_address");
+
+        let r = BtcKinAddress::from_str("A8VLkJpStiaMXS3bTm3iHC58uDwoCHwCZpL");
+        assert_eq!(r.err().unwrap().to_string(), "invalid_address");
+    }
+
+    #[test]
+    fn test_address_valid() {
+        let coin = coin_info_from_param("BITCOIN", "MAINNET", "P2WPKH", "").unwrap();
+        assert!(BtcKinAddress::is_valid(
+            "3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG",
+            &coin
+        ));
+
+        let coin = coin_info_from_param("BITCOIN", "MAINNET", "NONE", "").unwrap();
+        assert!(BtcKinAddress::is_valid(
+            "1Gx9QwpQBFnAjF27Uiz3ea2zYBDrLx31bw",
+            &coin
+        ));
+
+        let coin = coin_info_from_param("BITCOIN", "MAINNET", "VERSION_0", "").unwrap();
+        assert!(BtcKinAddress::is_valid(
+            "bc1qnfv46v0wtarc6n82dnehtvzj2gtnqzjhj5wxqj",
+            &coin
+        ));
+
+        let coin = coin_info_from_param("LITECOIN", "MAINNET", "NONE", "").unwrap();
+        assert!(BtcKinAddress::is_valid(
+            "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP",
+            &coin
+        ));
+        let coin = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "").unwrap();
+        assert!(BtcKinAddress::is_valid(
+            "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW",
+            &coin
+        ));
+
+        let coin = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "").unwrap();
+        assert!(!BtcKinAddress::is_valid(
+            "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDf",
+            &coin
+        ));
+
+        let coin = coin_info_from_param("LITECOIN", "MAINNET", "P2WPKH", "").unwrap();
+        assert!(!BtcKinAddress::is_valid("aaa", &coin));
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let prv_str = "28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let mut coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/2'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let address = BtcKinAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "1PeUvjuxyf31aJKX6kCXuaqxhmG78ZUdL1");
+
+        let pub_str = "030589ee559348bd6a7325994f9c8eff12bd5d73cc683142bd0dd1a17abc99b0dc";
+        let pub_key =
+            TypedPublicKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(pub_str).unwrap())
+                .unwrap();
+        let address = BtcKinAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "1KbUJ4x8epz6QqxkmZbTc4f79JbWWz6g37");
+
+        let pub_str = "0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798";
+        let pub_key =
+            TypedPublicKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(pub_str).unwrap())
+                .unwrap();
+        coin_info.seg_wit = "VERSION_0".to_string();
+        let address = BtcKinAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4");
+    }
+
+    #[test]
+    fn test_bip84_spec_vector() {
+        let pub_key = TypedPublicKey::from_slice(
+            CurveType::SECP256k1,
+            &Vec::from_hex("0330d54fd0dd420a6e5f8d3624f5f3482cae350f79d5f0753bf5beef9c2d91af3c")
+                .unwrap(),
+        )
+        .unwrap();
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/84'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "VERSION_0".to_string(),
+        };
+        let address = BtcKinAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "bc1qcr8te4kr609gcawutmrza0j4xv80jy8z306fyu");
+
+        let pub_key = TypedPublicKey::from_slice(
+            CurveType::SECP256k1,
+            &Vec::from_hex("03e775fd51f0dfb8cd865d9ff1cca2a158cf651fe997fdc9fee9c1d3b5e995ea77")
+                .unwrap(),
+        )
+        .unwrap();
+        let address = BtcKinAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "bc1qnjg0jd8228aq7egyzacy8cys3knf9xvrerkf9g");
+
+        let pub_key = TypedPublicKey::from_slice(
+            CurveType::SECP256k1,
+            &Vec::from_hex("03025324888e429ab8e3dbaf1f7802648b9cd01e9b418485c5fa4c1b9b5700e1a6")
+                .unwrap(),
+        )
+        .unwrap();
+        let address = BtcKinAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "bc1q8c6fshw2dlwun7ekn9qwf37cu2rn755upcp6el");
+    }
+}
diff --git a/token-core/tcx-bch/src/address.rs b/token-core/tcx-btc-kin/src/bch_address.rs
similarity index 76%
rename from token-core/tcx-bch/src/address.rs
rename to token-core/tcx-btc-kin/src/bch_address.rs
index 9d67efe3..8dca69e6 100644
--- a/token-core/tcx-bch/src/address.rs
+++ b/token-core/tcx-btc-kin/src/bch_address.rs
@@ -1,22 +1,31 @@
+use crate::address::{BtcKinAddress, ScriptPubkey};
 use crate::{Error, Result};
+
 use bch_addr::Converter;
-use bitcoin::network::constants::Network;
-use bitcoin::util::address::Error as BtcAddressError;
-use bitcoin::{Address as BtcAddress, Script};
-use core::result;
+use bitcoin::Script;
 
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
-use tcx_btc_fork::{BtcForkAddress, PubKeyScript, ScriptPubKeyComponent};
-use tcx_chain::Address;
 use tcx_constants::CoinInfo;
+use tcx_keystore::Address;
 use tcx_primitive::TypedPublicKey;
 
+fn remove_bch_prefix(addr: &str) -> String {
+    if let Some(sep) = addr.rfind(':') {
+        if addr.len() > sep + 1 {
+            return addr.split_at(sep + 1).1.to_owned();
+        } else {
+            return "".to_string();
+        }
+    }
+    addr.to_owned()
+}
+
 fn legacy_to_bch(addr: &str) -> Result<String> {
     let convert = Converter::new();
-    let bch_addr = if convert.is_legacy_addr(&addr) {
+    let bch_addr = if convert.is_legacy_addr(addr) {
         convert
-            .to_cash_addr(&addr)
+            .to_cash_addr(addr)
             .map_err(|_| Error::ConvertToCashAddressFailed(addr.to_string()))?
     } else {
         addr.to_string()
@@ -24,43 +33,34 @@ fn legacy_to_bch(addr: &str) -> Result<String> {
     Ok(remove_bch_prefix(&bch_addr))
 }
 
-fn _bch_to_legacy(addr: &str) -> Result<String> {
+fn bch_to_legacy(addr: &str) -> Result<String> {
     let convert = Converter::new();
-    if !convert.is_legacy_addr(&addr) {
-        convert
-            .to_legacy_addr(&addr)
-            .map_err(|_| Error::ConvertToLegacyAddressFailed(addr.to_string()).into())
+    if !convert.is_legacy_addr(addr) {
+        Ok(convert
+            .to_legacy_addr(addr)
+            .map_err(|_| Error::InvalidAddress)?)
     } else {
         Ok(addr.to_string())
     }
 }
 
 impl FromStr for BchAddress {
-    type Err = BtcAddressError;
+    type Err = anyhow::Error;
 
-    fn from_str(s: &str) -> result::Result<BchAddress, BtcAddressError> {
-        let legacy = _bch_to_legacy(s).expect("_bch_to_legacy");
-        let btc_addr = BtcAddress::from_str(&legacy)?;
+    fn from_str(s: &str) -> Result<BchAddress> {
+        let legacy = bch_to_legacy(s)?;
+        let btc_addr = BtcKinAddress::from_str(&legacy)?;
         Ok(BchAddress(btc_addr))
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
-pub struct BchAddress(pub BtcAddress);
-
-fn remove_bch_prefix(addr: &str) -> String {
-    if let Some(sep) = addr.rfind(':') {
-        if addr.len() > sep + 1 {
-            return addr.split_at(sep + 1).1.to_owned();
-        }
-    }
-    return addr.to_owned();
-}
+#[derive(Clone, PartialEq, Eq)]
+pub struct BchAddress(pub BtcKinAddress);
 
 impl BchAddress {
     pub fn convert_to_legacy_if_need(addr: &str) -> Result<String> {
         if Converter::default().is_cash_addr(addr) {
-            _bch_to_legacy(addr)
+            bch_to_legacy(addr)
         } else {
             Ok(addr.to_string())
         }
@@ -68,9 +68,10 @@ impl BchAddress {
 }
 
 impl Address for BchAddress {
-    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<String> {
-        let addr = BtcForkAddress::from_public_key(public_key, coin)?;
-        legacy_to_bch(&addr)
+    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<Self> {
+        Ok(BchAddress(BtcKinAddress::from_public_key(
+            public_key, coin,
+        )?))
     }
 
     fn is_valid(address: &str, coin: &CoinInfo) -> bool {
@@ -78,12 +79,12 @@ impl Address for BchAddress {
 
         if converter.is_legacy_addr(address) || converter.is_cash_addr(address) {
             if converter.is_mainnet_addr(address) {
-                return coin.network == "MAINNET";
+                coin.network == "MAINNET"
             } else {
-                return coin.network == "TESTNET";
+                coin.network == "TESTNET"
             }
         } else {
-            return false;
+            false
         }
     }
 }
@@ -96,32 +97,21 @@ impl Display for BchAddress {
     }
 }
 
-impl PubKeyScript for BchAddress {
-    fn script_pub_key(&self) -> Script {
+impl ScriptPubkey for BchAddress {
+    fn script_pubkey(&self) -> Script {
         self.0.script_pubkey()
     }
 }
 
-impl ScriptPubKeyComponent for BchAddress {
-    fn address_script_like(_target_addr: &str, pub_key: &bitcoin::PublicKey) -> Result<Script> {
-        Ok(BtcAddress::p2pkh(&pub_key, Network::Bitcoin).script_pubkey())
-    }
-
-    fn address_script_pub_key(target_addr: &str) -> Result<Script> {
-        let target_addr = BchAddress::convert_to_legacy_if_need(target_addr)?;
-        let addr = BtcAddress::from_str(&target_addr)?;
-        Ok(addr.script_pubkey())
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use crate::address::{remove_bch_prefix, BchAddress};
+    use super::{remove_bch_prefix, BchAddress};
+    use tcx_common::FromHex;
 
-    use tcx_btc_fork::WifDisplay;
-    use tcx_chain::Address;
+    use crate::address::WIFDisplay;
     use tcx_constants::coin_info::coin_info_from_param;
     use tcx_constants::{CoinInfo, CurveType};
+    use tcx_keystore::Address;
     use tcx_primitive::{PrivateKey, Secp256k1PrivateKey, TypedPublicKey};
     use tcx_primitive::{PublicKey, TypedPrivateKey};
 
@@ -144,8 +134,10 @@ mod tests {
         let addr = BchAddress::from_public_key(
             &TypedPublicKey::from_slice(
                 CurveType::SECP256k1,
-                &hex::decode("026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868")
-                    .unwrap(),
+                &Vec::from_hex(
+                    "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+                )
+                .unwrap(),
             )
             .unwrap(),
             &coin_info,
@@ -160,8 +152,10 @@ mod tests {
         let addr = BchAddress::from_public_key(
             &TypedPublicKey::from_slice(
                 CurveType::SECP256k1,
-                &hex::decode("026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868")
-                    .unwrap(),
+                &Vec::from_hex(
+                    "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+                )
+                .unwrap(),
             )
             .unwrap(),
             &coin_info,
@@ -217,11 +211,9 @@ mod tests {
             remove_bch_prefix("qq2ug6v04ht22n0daxxzl0rzlvsmzwcdwuymj77ymy"),
             "qq2ug6v04ht22n0daxxzl0rzlvsmzwcdwuymj77ymy"
         );
-        assert_eq!(remove_bch_prefix("bitcoincash:"), "bitcoincash:");
-        assert_eq!(
-            remove_bch_prefix("qq2ug6v04ht22n0daxxzl0rzlvsmzwcdwuymj77ymy"),
-            "qq2ug6v04ht22n0daxxzl0rzlvsmzwcdwuymj77ymy"
-        );
+
+        assert_eq!(remove_bch_prefix("bitcoincash:"), "");
+
         assert_eq!(
             remove_bch_prefix(":qq2ug6v04ht22n0daxxzl0rzlvsmzwcdwuymj77ymy"),
             "qq2ug6v04ht22n0daxxzl0rzlvsmzwcdwuymj77ymy"
@@ -281,4 +273,24 @@ mod tests {
             assert_eq!(wif, typed_private_key.fmt(&coin_info).unwrap());
         }
     }
+
+    #[test]
+    fn cross_test_tw() {
+        let prv_str = "28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let coin_info = CoinInfo {
+            coin: "BITCOINCASH".to_string(),
+            derivation_path: "".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let address = BchAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "qruxj7zq6yzpdx8dld0e9hfvt7u47zrw9gfr5hy0vh");
+    }
 }
diff --git a/token-core/tcx-btc-kin/src/bch_sighash.rs b/token-core/tcx-btc-kin/src/bch_sighash.rs
new file mode 100644
index 00000000..fc101d35
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/bch_sighash.rs
@@ -0,0 +1,184 @@
+use crate::sighash::TxSignatureHasher;
+use crate::{Error, Result};
+use bitcoin::consensus::Encodable;
+use bitcoin::psbt::Prevouts;
+use bitcoin::util::sighash::Annex;
+use bitcoin::util::taproot::{TapLeafHash, TapSighashHash};
+use bitcoin::{EcdsaSighashType, SchnorrSighashType, Script, Sighash, Transaction, TxOut};
+use bitcoin_hashes::{sha256d, Hash};
+use std::io;
+
+pub const SIGHASH_ANYONECANPAY: u32 = 0x80;
+
+/// Bitcoin Cash sighash flag for use on outputs after the fork
+
+pub struct BitcoinCashSighash {
+    tx: Transaction,
+    fork_id: u32,
+    segwit_cache: Option<SegwitCache>,
+}
+
+#[derive(Debug)]
+struct SegwitCache {
+    prevouts: sha256d::Hash,
+    sequences: sha256d::Hash,
+
+    /// In theory `outputs` could be an `Option` since `SIGHASH_NONE` and `SIGHASH_SINGLE` do not
+    /// need it, but since `SIGHASH_ALL` is by far the most used variant we don't bother.
+    outputs: sha256d::Hash,
+}
+impl BitcoinCashSighash {
+    fn segwit_cache(&mut self) -> &SegwitCache {
+        self.segwit_cache.get_or_insert_with(|| {
+            let mut enc_prevouts = sha256d::Hash::engine();
+            let mut enc_sequences = sha256d::Hash::engine();
+            for txin in self.tx.input.iter() {
+                txin.previous_output
+                    .consensus_encode(&mut enc_prevouts)
+                    .unwrap();
+                txin.sequence.consensus_encode(&mut enc_sequences).unwrap();
+            }
+            SegwitCache {
+                prevouts: sha256d::Hash::from_engine(enc_prevouts),
+                sequences: sha256d::Hash::from_engine(enc_sequences),
+                outputs: {
+                    let mut enc = sha256d::Hash::engine();
+                    for txout in self.tx.output.iter() {
+                        txout.consensus_encode(&mut enc).unwrap();
+                    }
+                    sha256d::Hash::from_engine(enc)
+                },
+            }
+        })
+    }
+
+    pub fn new(tx: Transaction, fork_id: u32) -> Self {
+        BitcoinCashSighash {
+            tx,
+            fork_id,
+            segwit_cache: None,
+        }
+    }
+
+    pub fn signature_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: u32,
+    ) -> Result<Sighash> {
+        let mut enc = Sighash::engine();
+        self.encode_signing_data_to(&mut enc, input_index, script_code, value, sighash_type)?;
+        Ok(Sighash::from_engine(enc))
+    }
+
+    pub fn encode_signing_data_to<Write: io::Write>(
+        &mut self,
+        mut writer: Write,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: u32,
+    ) -> Result<()> {
+        let zero_hash = sha256d::Hash::all_zeros();
+
+        let anyone_can_pay = sighash_type & SIGHASH_ANYONECANPAY != 0;
+        let base_type = EcdsaSighashType::from_consensus(sighash_type);
+
+        self.tx.version.consensus_encode(&mut writer)?;
+
+        if !anyone_can_pay {
+            self.segwit_cache().prevouts.consensus_encode(&mut writer)?;
+        } else {
+            zero_hash.consensus_encode(&mut writer)?;
+        }
+
+        if !anyone_can_pay
+            && base_type != EcdsaSighashType::Single
+            && base_type != EcdsaSighashType::None
+        {
+            self.segwit_cache()
+                .sequences
+                .consensus_encode(&mut writer)?;
+        } else {
+            zero_hash.consensus_encode(&mut writer)?;
+        }
+
+        {
+            let txin = &self.tx.input.get(input_index).ok_or(
+                bitcoin::util::sighash::Error::IndexOutOfInputsBounds {
+                    index: input_index,
+                    inputs_size: self.tx.input.len(),
+                },
+            )?;
+
+            txin.previous_output.consensus_encode(&mut writer)?;
+            script_code.consensus_encode(&mut writer)?;
+            value.consensus_encode(&mut writer)?;
+            txin.sequence.consensus_encode(&mut writer)?;
+        }
+
+        if base_type != EcdsaSighashType::Single && base_type != EcdsaSighashType::None {
+            self.segwit_cache().outputs.consensus_encode(&mut writer)?;
+        } else if base_type == EcdsaSighashType::Single && input_index < self.tx.output.len() {
+            let mut single_enc = Sighash::engine();
+            self.tx.output[input_index].consensus_encode(&mut single_enc)?;
+            Sighash::from_engine(single_enc).consensus_encode(&mut writer)?;
+            // padding zero hash, copy form bitcoin core
+        } else {
+            zero_hash.consensus_encode(&mut writer)?;
+        }
+
+        self.tx.lock_time.consensus_encode(&mut writer)?;
+        sighash_type.consensus_encode(&mut writer)?;
+
+        Ok(())
+    }
+}
+
+impl TxSignatureHasher for BitcoinCashSighash {
+    fn consensus_sighash_type(&self, base_type: u32) -> u32 {
+        base_type | self.fork_id
+    }
+
+    fn segwit_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: EcdsaSighashType,
+    ) -> Result<Sighash> {
+        self.signature_hash(
+            input_index,
+            script_code,
+            value,
+            self.consensus_sighash_type(sighash_type.to_u32()),
+        )
+    }
+
+    fn legacy_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: u32,
+    ) -> Result<Sighash> {
+        self.signature_hash(
+            input_index,
+            script_code,
+            value,
+            self.consensus_sighash_type(sighash_type),
+        )
+    }
+
+    fn taproot_hash(
+        &mut self,
+        _: usize,
+        _: &Prevouts<TxOut>,
+        _: Option<Annex>,
+        _: Option<(TapLeafHash, u32)>,
+        _: SchnorrSighashType,
+    ) -> Result<TapSighashHash> {
+        Err(Error::UnsupportedTaproot.into())
+    }
+}
diff --git a/token-core/tcx-btc-kin/src/lib.rs b/token-core/tcx-btc-kin/src/lib.rs
new file mode 100644
index 00000000..c283f3a6
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/lib.rs
@@ -0,0 +1,89 @@
+#![feature(let_chains)]
+
+pub mod address;
+pub mod bch_address;
+mod bch_sighash;
+mod sighash;
+
+pub mod network;
+pub mod signer;
+pub mod transaction;
+
+use core::result;
+use thiserror::Error;
+
+extern crate num_bigint;
+extern crate num_integer;
+extern crate num_traits;
+
+#[macro_use]
+extern crate tcx_keystore;
+extern crate core;
+
+pub type Result<T> = result::Result<T, anyhow::Error>;
+
+pub use address::{BtcKinAddress, WIFDisplay};
+pub use bch_address::BchAddress;
+pub use network::BtcKinNetwork;
+pub use transaction::{BtcKinTxInput, BtcKinTxOutput, OmniTxInput, Utxo};
+
+pub const BITCOIN: &str = "BITCOIN";
+pub const BITCOINCASH: &str = "BITCOINCASH";
+
+pub const LITECOIN: &str = "LITECOIN";
+
+pub const OMNI: &str = "OMNI";
+
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error("decrypt_xpub_error")]
+    DecryptXPubError,
+    #[error("unsupported_chain")]
+    UnsupportedChain,
+    #[error("missing_network")]
+    MissingNetwork,
+    #[error("invalid_utxo")]
+    InvalidUtxo,
+    #[error("invalid_address")]
+    InvalidAddress,
+    #[error("bch_convert_to_legacy_address_failed# address: {0}")]
+    ConvertToLegacyAddressFailed(String),
+    #[error("bch_convert_to_cash_address_failed# address: {0}")]
+    ConvertToCashAddressFailed(String),
+    #[error("construct_bch_address_failed# address: {0}")]
+    ConstructBchAddressFailed(String),
+    #[error("unsupported_taproot")]
+    UnsupportedTaproot,
+}
+
+pub mod bitcoin {
+    use crate::{BITCOIN, LITECOIN};
+    pub const CHAINS: [&str; 2] = [BITCOIN, LITECOIN];
+    pub type Address = crate::BtcKinAddress;
+    pub type TransactionInput = crate::transaction::BtcKinTxInput;
+    pub type TransactionOutput = crate::transaction::BtcKinTxOutput;
+}
+
+pub mod bitcoincash {
+    use crate::BITCOINCASH;
+
+    pub static CHAINS: [&str; 1] = [BITCOINCASH];
+
+    pub type Address = crate::BchAddress;
+
+    pub type TransactionInput = crate::transaction::BtcKinTxInput;
+
+    pub type TransactionOutput = crate::transaction::BtcKinTxOutput;
+}
+
+pub mod omni {
+    use crate::OMNI;
+
+    pub static CHAINS: [&str; 1] = [OMNI];
+
+    pub type Address = crate::BtcKinAddress;
+
+    pub type TransactionInput = crate::transaction::OmniTxInput;
+
+    pub type TransactionOutput = crate::transaction::BtcKinTxOutput;
+}
diff --git a/token-core/tcx-btc-kin/src/network.rs b/token-core/tcx-btc-kin/src/network.rs
new file mode 100644
index 00000000..2fa40979
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/network.rs
@@ -0,0 +1,93 @@
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct BtcKinNetwork {
+    pub coin: &'static str,
+    pub network: &'static str,
+
+    pub bech32_hrp: &'static str,
+    pub p2pkh_prefix: u8,
+    pub p2sh_prefix: u8,
+    pub private_prefix: u8,
+
+    pub xpub_prefix: [u8; 4],
+    pub xprv_prefix: [u8; 4],
+}
+const BTC_KIN_NETWORKS: [BtcKinNetwork; 6] = [
+    BtcKinNetwork {
+        coin: "BITCOIN",
+        network: "MAINNET",
+        bech32_hrp: "bc",
+        p2pkh_prefix: 0x0,
+        p2sh_prefix: 0x05,
+        private_prefix: 0x80,
+        xpub_prefix: [0x04, 0x88, 0xb2, 0x1e],
+        xprv_prefix: [0x04, 0x88, 0xad, 0xe4],
+    },
+    BtcKinNetwork {
+        coin: "BITCOIN",
+        network: "TESTNET",
+        bech32_hrp: "tb",
+        p2pkh_prefix: 0x6f,
+        p2sh_prefix: 0xc4,
+        private_prefix: 0xef,
+        xpub_prefix: [0x04, 0x35, 0x87, 0xcf],
+        xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+    },
+    BtcKinNetwork {
+        coin: "LITECOIN",
+        network: "MAINNET",
+        bech32_hrp: "ltc",
+        p2pkh_prefix: 0x30,
+        p2sh_prefix: 0x32,
+        private_prefix: 0xb0,
+        xpub_prefix: [0x04, 0x88, 0xb2, 0x1e],
+        xprv_prefix: [0x04, 0x88, 0xad, 0xe4],
+    },
+    BtcKinNetwork {
+        coin: "LITECOIN",
+        network: "TESTNET",
+        bech32_hrp: "tltc",
+        p2pkh_prefix: 0x6f,
+        p2sh_prefix: 0x3a,
+        private_prefix: 0xef,
+        xpub_prefix: [0x04, 0x35, 0x87, 0xcf],
+        xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+    },
+    BtcKinNetwork {
+        coin: "BITCOINCASH",
+        network: "MAINNET",
+        bech32_hrp: "bitcoincash",
+        p2pkh_prefix: 0x0,
+        p2sh_prefix: 0x05,
+        private_prefix: 0x80,
+        xpub_prefix: [0x04, 0x88, 0xb2, 0x1e],
+        xprv_prefix: [0x04, 0x88, 0xad, 0xe4],
+    },
+    BtcKinNetwork {
+        coin: "BITCOINCASH",
+        network: "TESTNET",
+        bech32_hrp: "bchtest",
+        p2pkh_prefix: 0x6f,
+        p2sh_prefix: 0xc4,
+        private_prefix: 0xef,
+        xpub_prefix: [0x04, 0x35, 0x87, 0xcf],
+        xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+    },
+];
+
+impl BtcKinNetwork {
+    pub fn find_by_coin<'a>(coin: &str, network: &str) -> Option<&'a BtcKinNetwork> {
+        BTC_KIN_NETWORKS
+            .iter()
+            .find(|net| net.coin == coin && net.network == network)
+    }
+
+    pub fn find_by_hrp<'a>(hrp: &str) -> Option<&'a BtcKinNetwork> {
+        BTC_KIN_NETWORKS.iter().find(|net| net.bech32_hrp == hrp)
+    }
+
+    pub fn find_by_prefix<'a>(prefix: u8) -> Option<&'a BtcKinNetwork> {
+        BTC_KIN_NETWORKS
+            .iter()
+            .find(|net| net.p2pkh_prefix == prefix || net.p2sh_prefix == prefix)
+    }
+}
diff --git a/token-core/tcx-btc-kin/src/sighash.rs b/token-core/tcx-btc-kin/src/sighash.rs
new file mode 100644
index 00000000..4fc9a120
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/sighash.rs
@@ -0,0 +1,76 @@
+use crate::Result;
+use bitcoin::psbt::Prevouts;
+use bitcoin::util::sighash::{Annex, SighashCache};
+use bitcoin::util::taproot::{TapLeafHash, TapSighashHash};
+use bitcoin::{EcdsaSighashType, SchnorrSighashType, Script, Sighash, Transaction, TxOut};
+
+pub trait TxSignatureHasher {
+    fn consensus_sighash_type(&self, base_type: u32) -> u32;
+    fn segwit_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: EcdsaSighashType,
+    ) -> Result<Sighash>;
+
+    fn legacy_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: u32,
+    ) -> Result<Sighash>;
+
+    fn taproot_hash(
+        &mut self,
+        input_index: usize,
+        prevouts: &Prevouts<TxOut>,
+        annex: Option<Annex>,
+        leaf_hash_code_separator: Option<(TapLeafHash, u32)>,
+        sighash_type: SchnorrSighashType,
+    ) -> Result<TapSighashHash>;
+}
+
+impl TxSignatureHasher for SighashCache<Box<Transaction>> {
+    fn consensus_sighash_type(&self, base_type: u32) -> u32 {
+        base_type
+    }
+
+    fn segwit_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        value: u64,
+        sighash_type: EcdsaSighashType,
+    ) -> Result<Sighash> {
+        Ok(self.segwit_signature_hash(input_index, script_code, value, sighash_type)?)
+    }
+
+    fn legacy_hash(
+        &mut self,
+        input_index: usize,
+        script_code: &Script,
+        _: u64,
+        sighash_type: u32,
+    ) -> Result<Sighash> {
+        Ok(self.legacy_signature_hash(input_index, script_code, sighash_type)?)
+    }
+
+    fn taproot_hash(
+        &mut self,
+        input_index: usize,
+        prevouts: &Prevouts<TxOut>,
+        annex: Option<Annex>,
+        leaf_hash_code_separator: Option<(TapLeafHash, u32)>,
+        sighash_type: SchnorrSighashType,
+    ) -> Result<TapSighashHash> {
+        Ok(self.taproot_signature_hash(
+            input_index,
+            prevouts,
+            annex,
+            leaf_hash_code_separator,
+            sighash_type,
+        )?)
+    }
+}
diff --git a/token-core/tcx-btc-kin/src/signer.rs b/token-core/tcx-btc-kin/src/signer.rs
new file mode 100644
index 00000000..99f1e2bd
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/signer.rs
@@ -0,0 +1,1470 @@
+use std::io::Write;
+use std::marker::PhantomData;
+use std::str::FromStr;
+
+use bitcoin::blockdata::script::Builder;
+use bitcoin::consensus::serialize;
+use bitcoin::psbt::Prevouts;
+use bitcoin::schnorr::TapTweak;
+use bitcoin::util::sighash::SighashCache;
+use bitcoin::{
+    EcdsaSighashType, OutPoint, PackedLockTime, SchnorrSighashType, Script, Sequence, Transaction,
+    TxIn, TxOut, WPubkeyHash, Witness,
+};
+use bitcoin_hashes::hash160;
+use bitcoin_hashes::hex::FromHex as HashFromHex;
+use bitcoin_hashes::hex::ToHex as HashToHex;
+use bitcoin_hashes::Hash;
+use byteorder::{BigEndian, WriteBytesExt};
+use secp256k1::{Message, Secp256k1};
+use tcx_constants::{CoinInfo, CurveType};
+
+use tcx_keystore::{Address, SignatureParameters};
+use tcx_keystore::{Keystore, TransactionSigner};
+use tcx_primitive::{get_account_path, Derive, PrivateKey, PublicKey, Secp256k1PrivateKey};
+
+use crate::address::{BtcKinAddress, ScriptPubkey};
+use crate::bch_sighash::BitcoinCashSighash;
+use crate::sighash::TxSignatureHasher;
+use crate::transaction::{BtcKinTxInput, BtcKinTxOutput, OmniTxInput, Utxo};
+use crate::{BchAddress, Result, BITCOIN, BITCOINCASH};
+
+use super::Error;
+use anyhow::ensure;
+
+const MIN_TX_FEE: u64 = 546;
+
+pub struct TxSigner {
+    tx: Transaction,
+    prevouts: Vec<TxOut>,
+    private_keys: Vec<Secp256k1PrivateKey>,
+    sighash_cache: Box<dyn TxSignatureHasher>,
+}
+
+impl TxSigner {
+    fn hash160(&self, input: &[u8]) -> hash160::Hash {
+        hash160::Hash::hash(input)
+    }
+
+    fn sign_p2pkh_input(&mut self, index: usize) -> Result<()> {
+        let key = &self.private_keys[index];
+        let prevout = &self.prevouts[index];
+
+        let hash = self.sighash_cache.legacy_hash(
+            index,
+            &prevout.script_pubkey,
+            prevout.value,
+            EcdsaSighashType::All.to_u32(),
+        )?;
+        let sig = key.sign(&hash)?;
+
+        let sig = [
+            sig,
+            vec![self
+                .sighash_cache
+                .consensus_sighash_type(EcdsaSighashType::All.to_u32()) as u8],
+        ]
+        .concat();
+
+        self.tx.input[index].script_sig = Builder::new()
+            .push_slice(&sig)
+            .push_slice(&key.public_key().to_bytes())
+            .into_script();
+
+        Ok(())
+    }
+
+    fn sign_p2sh_nested_p2wpkh_input(&mut self, index: usize) -> Result<()> {
+        let prevout = &self.prevouts[index];
+        let key = &self.private_keys[index];
+        let pub_key = key.public_key();
+
+        let script = Script::new_v0_p2wpkh(&WPubkeyHash::from_hash(
+            self.hash160(&pub_key.to_compressed()),
+        ));
+
+        let hash = self.sighash_cache.segwit_hash(
+            index,
+            &script.p2wpkh_script_code().expect("must be v0_p2wpkh"),
+            prevout.value,
+            EcdsaSighashType::All,
+        )?;
+        let sig = key.sign(&hash)?;
+
+        let tx_input = &mut self.tx.input[index];
+
+        let sig = [
+            sig,
+            vec![self
+                .sighash_cache
+                .consensus_sighash_type(EcdsaSighashType::All.to_u32()) as u8],
+        ]
+        .concat();
+
+        tx_input.witness.push(sig);
+        tx_input.witness.push(pub_key.to_bytes());
+        tx_input.script_sig = Builder::new().push_slice(&script.to_bytes()).into_script();
+
+        Ok(())
+    }
+
+    fn sign_p2wpkh_input(&mut self, index: usize) -> Result<()> {
+        let key = &self.private_keys[index];
+        let prevout = &self.prevouts[index];
+
+        let hash = self.sighash_cache.segwit_hash(
+            index,
+            &prevout
+                .script_pubkey
+                .p2wpkh_script_code()
+                .expect("must be v0_p2wpkh"),
+            prevout.value,
+            EcdsaSighashType::All,
+        )?;
+        let sig = key.sign(&hash)?;
+
+        let tx_input = &mut self.tx.input[index];
+
+        let sig = [
+            sig,
+            vec![self
+                .sighash_cache
+                .consensus_sighash_type(EcdsaSighashType::All.to_u32()) as u8],
+        ]
+        .concat();
+        tx_input.witness.push(sig);
+        tx_input.witness.push(key.public_key().to_bytes());
+
+        Ok(())
+    }
+
+    fn sign_p2tr_input(&mut self, index: usize) -> Result<()> {
+        let key = &self.private_keys[index];
+        let secp = Secp256k1::new();
+
+        let key_pair =
+            bitcoin::schnorr::UntweakedKeyPair::from_seckey_slice(&secp, &key.to_bytes())?
+                .tap_tweak(&secp, None);
+
+        let hash = self.sighash_cache.taproot_hash(
+            index,
+            &Prevouts::All(&self.prevouts.clone()),
+            None,
+            None,
+            SchnorrSighashType::Default,
+        )?;
+
+        let msg = Message::from_slice(&hash[..])?;
+        let sig = secp.sign_schnorr(&msg, &key_pair.to_inner());
+
+        let tx_input = &mut self.tx.input[index];
+
+        tx_input.witness.push(sig.as_ref());
+
+        Ok(())
+    }
+
+    fn sign(&mut self) -> Result<()> {
+        for idx in 0..self.prevouts.len() {
+            let prevout = &self.prevouts[idx];
+
+            if prevout.script_pubkey.is_p2pkh() {
+                self.sign_p2pkh_input(idx)?;
+            } else if prevout.script_pubkey.is_p2sh() {
+                self.sign_p2sh_nested_p2wpkh_input(idx)?;
+            } else if prevout.script_pubkey.is_v0_p2wpkh() {
+                self.sign_p2wpkh_input(idx)?;
+            } else if prevout.script_pubkey.is_v1_p2tr() {
+                self.sign_p2tr_input(idx)?;
+            }
+        }
+
+        Ok(())
+    }
+}
+
+pub struct KinTransaction<T: Address + ScriptPubkey + FromStr<Err = anyhow::Error>> {
+    inputs: Vec<Utxo>,
+    amount: u64,
+    fee: u64,
+    to: String,
+    change_address_index: Option<u32>,
+    op_return: Option<String>,
+    phantom: PhantomData<T>,
+}
+
+impl<T: Address + ScriptPubkey + FromStr<Err = anyhow::Error>> KinTransaction<T> {
+    fn tx_outs(&self, change_script: Script) -> Result<Vec<TxOut>> {
+        let mut total_amount = 0u64;
+
+        for input in &self.inputs {
+            total_amount += input.amount;
+        }
+
+        ensure!(self.amount >= MIN_TX_FEE, "amount_less_than_minimum");
+        ensure!(
+            total_amount >= (self.amount + self.fee),
+            "total amount must ge amount + fee"
+        );
+
+        let mut tx_outs: Vec<TxOut> = vec![];
+
+        let to = T::from_str(&self.to)?.script_pubkey();
+
+        tx_outs.push(TxOut {
+            value: self.amount,
+            script_pubkey: to,
+        });
+
+        let change_amount = total_amount - self.amount - self.fee;
+
+        if change_amount >= MIN_TX_FEE {
+            tx_outs.push(TxOut {
+                value: change_amount,
+                script_pubkey: change_script,
+            });
+        }
+
+        if let Some(op_return) = &self.op_return {
+            tx_outs.push(TxOut {
+                value: 0,
+                script_pubkey: Script::new_op_return(&Vec::from_hex(op_return)?),
+            });
+        }
+
+        Ok(tx_outs)
+    }
+
+    pub fn prepare_tx(
+        &self,
+        keystore: &mut Keystore,
+        params: &SignatureParameters,
+    ) -> Result<(Script, Vec<Secp256k1PrivateKey>, i32, Vec<TxOut>, Vec<TxIn>)> {
+        let mut prevouts = vec![];
+        let mut tx_inputs: Vec<TxIn> = vec![];
+
+        if self.inputs.is_empty() {
+            return Err(Error::InvalidUtxo.into());
+        }
+
+        let coin_info = CoinInfo {
+            coin: params.chain_type.clone(),
+            derivation_path: params.derivation_path.clone(),
+            curve: params.curve,
+            network: params.network.clone(),
+            seg_wit: params.seg_wit.clone(),
+        };
+
+        let change_script = if let Some(change_address_index) = self.change_address_index && keystore.derivable() {
+            let account_path = get_account_path(&params.derivation_path)?;
+            let dpk = keystore.get_deterministic_public_key(params.curve, &account_path)?;
+            let pub_key = dpk
+                .derive(format!("1/{}", change_address_index).as_str())?
+                .public_key();
+
+           T::from_public_key(&pub_key, &coin_info)?.script_pubkey()
+        } else {
+           T::from_str(&self.inputs[0].address)?.script_pubkey()
+        };
+
+        let mut sks = vec![];
+
+        let mut version = 1;
+
+        for x in self.inputs.iter() {
+            let script_pubkey = T::from_str(&x.address)?.script_pubkey();
+
+            if !script_pubkey.is_p2pkh() {
+                version = 2
+            }
+
+            prevouts.push(TxOut {
+                value: x.amount,
+                script_pubkey: script_pubkey.clone(),
+            });
+
+            tx_inputs.push(TxIn {
+                previous_output: OutPoint {
+                    txid: bitcoin::hash_types::Txid::from_hex(&x.tx_hash)?,
+                    vout: x.vout,
+                },
+                script_sig: Script::new(),
+                sequence: Sequence::MAX,
+                witness: Witness::default(),
+            });
+
+            if !x.derived_path.is_empty() && keystore.derivable() {
+                sks.push(
+                    keystore
+                        .get_private_key(CurveType::SECP256k1, &x.derived_path)?
+                        .as_secp256k1()?
+                        .clone(),
+                );
+            } else {
+                sks.push(
+                    keystore
+                        .get_private_key(CurveType::SECP256k1, "")?
+                        .as_secp256k1()?
+                        .clone(),
+                );
+            }
+        }
+
+        Ok((change_script, sks, version, prevouts, tx_inputs))
+    }
+
+    pub fn sign(
+        &self,
+        keystore: &mut Keystore,
+        params: &SignatureParameters,
+    ) -> Result<BtcKinTxOutput> {
+        let (change_script, private_keys, version, prevouts, tx_inputs) =
+            self.prepare_tx(keystore, params)?;
+
+        let tx_outs = self.tx_outs(change_script)?;
+
+        let tx = Transaction {
+            version,
+            lock_time: PackedLockTime::ZERO,
+            input: tx_inputs.clone(),
+            output: tx_outs.clone(),
+        };
+
+        //Only for txsighash
+        let tx_clone = Transaction {
+            version,
+            lock_time: PackedLockTime::ZERO,
+            input: tx_inputs,
+            output: tx_outs,
+        };
+
+        let sighash_cache: Box<dyn TxSignatureHasher> = if params.chain_type == BITCOINCASH {
+            Box::new(BitcoinCashSighash::new(tx_clone, 0x40))
+        } else {
+            Box::new(SighashCache::new(Box::new(tx_clone)))
+        };
+
+        let mut singer = TxSigner {
+            tx,
+            prevouts,
+            private_keys,
+            sighash_cache,
+        };
+
+        singer.sign()?;
+
+        let tx = singer.tx;
+        let tx_bytes = serialize(&tx);
+        let tx_hash = tx.txid().to_hex();
+        let wtx_hash = tx.wtxid().to_hex();
+
+        Ok(BtcKinTxOutput {
+            raw_tx: tx_bytes.to_hex(),
+            wtx_hash,
+            tx_hash,
+        })
+    }
+}
+
+impl TransactionSigner<BtcKinTxInput, BtcKinTxOutput> for Keystore {
+    fn sign_transaction(
+        &mut self,
+        params: &SignatureParameters,
+        tx: &BtcKinTxInput,
+    ) -> Result<BtcKinTxOutput> {
+        if params.chain_type == BITCOINCASH {
+            let kin_tx = KinTransaction {
+                inputs: tx.inputs.clone(),
+                amount: tx.amount,
+                fee: tx.fee,
+                to: tx.to.clone(),
+                change_address_index: tx.change_address_index,
+                op_return: tx.op_return.clone(),
+                phantom: PhantomData::<BchAddress>,
+            };
+            kin_tx.sign(self, params)
+        } else {
+            let kin_tx = KinTransaction {
+                inputs: tx.inputs.clone(),
+                amount: tx.amount,
+                fee: tx.fee,
+                to: tx.to.clone(),
+                change_address_index: tx.change_address_index,
+                op_return: tx.op_return.clone(),
+                phantom: PhantomData::<BtcKinAddress>,
+            };
+            kin_tx.sign(self, params)
+        }
+    }
+}
+
+impl TransactionSigner<OmniTxInput, BtcKinTxOutput> for Keystore {
+    fn sign_transaction(
+        &mut self,
+        params: &SignatureParameters,
+        tx: &OmniTxInput,
+    ) -> Result<BtcKinTxOutput> {
+        /*
+        OmniLayer Protocol marker(0x6f6d6e69) + 2bytes transaction version (0)
+         + 2bytes transaction type(0: simple send)
+         + 4bytes  Property type (31 is USDT)
+        byte[] OMNI_DATA_PREFIX = NumericUtil.hexToBytes("0x6f6d6e69000000000000001f");
+        */
+        let create_omni_op_return = || {
+            let mut wtr = Vec::new();
+            wtr.write_all(&Vec::from_hex("6f6d6e6900000000").unwrap())
+                .unwrap();
+            wtr.write_u32::<BigEndian>(tx.property_id).unwrap();
+            wtr.write_u64::<BigEndian>(tx.amount).unwrap();
+            wtr.to_hex()
+        };
+
+        let btc_tx = BtcKinTxInput {
+            inputs: tx.inputs.clone(),
+            amount: MIN_TX_FEE,
+            to: tx.to.clone(),
+            fee: tx.fee,
+            change_address_index: None,
+            op_return: Some(create_omni_op_return()),
+        };
+
+        let mut params = (*params).clone();
+        params.chain_type = BITCOIN.to_string();
+
+        self.sign_transaction(&params, &btc_tx)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use tcx_constants::coin_info::coin_info_from_param;
+    use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD, TEST_WIF};
+    use tcx_keystore::Metadata;
+    use tcx_keystore::{Keystore, TransactionSigner};
+    use tcx_primitive::Secp256k1PrivateKey;
+
+    use crate::{BITCOIN, LITECOIN};
+
+    use super::*;
+
+    fn hex_keystore(hex: &str) -> Keystore {
+        let mut keystore = Keystore::from_private_key(
+            hex,
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        keystore
+    }
+
+    fn wif_keystore(_wif: &str) -> Keystore {
+        let hex = Secp256k1PrivateKey::from_wif(TEST_WIF)
+            .unwrap()
+            .to_bytes()
+            .to_hex();
+
+        hex_keystore(&hex)
+    }
+
+    fn hd_keystore(mnemonic: &str) -> Keystore {
+        let mut keystore =
+            Keystore::from_mnemonic(mnemonic, TEST_PASSWORD, Metadata::default()).unwrap();
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        keystore
+    }
+
+    fn sample_private_key_keystore() -> Keystore {
+        wif_keystore(TEST_WIF)
+    }
+
+    fn sample_hd_keystore() -> Keystore {
+        hd_keystore(TEST_MNEMONIC)
+    }
+
+    mod kin {
+        use super::*;
+
+        #[test]
+        fn test_sign_less_than_dust() {
+            let mut ks = sample_private_key_keystore();
+
+            let inputs = vec![Utxo {
+                tx_hash: "e112b1215813c8888b31a80d215169809f7901359c0f4bf7e7374174ab2a64f4"
+                    .to_string(),
+                vout: 0,
+                amount: 65000000,
+                address: "n2ZNV88uQbede7C5M5jzi6SyG4GVuPpng6".to_string(),
+                derived_path: "".to_string(),
+            }];
+
+            let tx_input = BtcKinTxInput {
+                to: "mxCVgJtD2jSMv2diQVJQAwwq7Cg2wbwpmG".to_string(),
+                amount: MIN_TX_FEE - 1,
+                inputs: inputs.clone(),
+                fee: 1000,
+                change_address_index: Some(0u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input);
+
+            assert_eq!(
+                actual.err().unwrap().to_string(),
+                "amount_less_than_minimum"
+            );
+        }
+    }
+
+    mod omni {
+        use super::*;
+        use crate::OMNI;
+
+        #[test]
+        fn test_sign_with_hd_on_testnet() {
+            let mut ks = sample_hd_keystore();
+            let inputs = vec![Utxo {
+                tx_hash: "0dd195c815c5086c5995f43a0c67d28344ae5fa130739a5e03ef40fea54f2031"
+                    .to_string(),
+                vout: 0,
+                amount: 14824854,
+                address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                derived_path: "m/44'/1'/0'/0/0".to_string(),
+            }];
+
+            let tx_input = OmniTxInput {
+                to: "moLK3tBG86ifpDDTqAQzs4a9cUoNjVLRE3".to_string(),
+                amount: 10000000000,
+                inputs,
+                fee: 4000,
+                property_id: 31,
+            };
+
+            let params = SignatureParameters {
+                chain_type: OMNI.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                curve: CurveType::SECP256k1,
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(actual.raw_tx, "010000000131204fa5fe40ef035e9a7330a15fae4483d2670c3af495596c08c515c895d10d000000006a4730440220138f0bb42eda662c061e285e4999ff8297fedaedcdbcb5f7b5166234a685d3560220116e7b55d242f384cf02891cbd3eb602935177128e62a1efe670c0bf063a90000121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff0322020000000000001976a91455bdc1b42e3bed851959846ddf600e96125423e088acd423e200000000001976a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac0000000000000000166a146f6d6e69000000000000001f00000002540be40000000000");
+        }
+
+        #[test]
+        fn test_sign_with_hd_p2shp2wpkh_on_testnet() {
+            let mut ks = sample_hd_keystore();
+            let inputs = vec![Utxo {
+                tx_hash: "9baf6fd0e560f9f199f4879c23cb73b9c4affb54a1cfdbacb85687efa89f4c78"
+                    .to_string(),
+                vout: 1,
+                amount: 21863396,
+                address: "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB".to_string(),
+                derived_path: "m/49'/1'/0'/0/0".to_string(),
+            }];
+
+            let tx_input = OmniTxInput {
+                to: "moLK3tBG86ifpDDTqAQzs4a9cUoNjVLRE3".to_string(),
+                amount: 10000000000,
+                inputs,
+                fee: 4000,
+                property_id: 31,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: OMNI.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(actual.raw_tx, "02000000000101784c9fa8ef8756b8acdbcfa154fbafc4b973cb239c87f499f1f960e5d06faf9b0100000017160014654fbb08267f3d50d715a8f1abb55979b160dd5bffffffff0322020000000000001976a91455bdc1b42e3bed851959846ddf600e96125423e088ac228a4d010000000017a9142d2b1ef5ee4cf6c3ebc8cf66a602783798f78759870000000000000000166a146f6d6e69000000000000001f00000002540be4000247304402207e9c6d232084c9a0bcfa1f36184e6b044912e88630ebe624679642a99692529102202318c4c3a42d5656d300a42dc7796c5e0a6e9d1fb13465279fbe58bcd13345460121031aee5e20399d68cf0035d1a21564868f22bc448ab205292b4279136b15ecaebc00000000");
+        }
+    }
+
+    mod bitcoincash {
+        use crate::{BtcKinTxInput, Utxo, BITCOINCASH};
+        use tcx_constants::{CurveType, TEST_PASSWORD};
+        use tcx_keystore::{Keystore, Metadata, SignatureParameters, TransactionSigner};
+
+        #[test]
+        pub fn test_bch_signer() {
+            let inputs = vec![Utxo {
+                tx_hash: "09c3a49c1d01f6341c43ea43dd0de571664a45b4e7d9211945cb3046006a98e2"
+                    .to_string(),
+                vout: 0,
+                amount: 100000,
+                address: "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r".to_string(),
+                derived_path: "".to_string(),
+            }];
+
+            let tx_input = BtcKinTxInput {
+                to: "qq40fskqshxem2gvz0xkf34ww3h6zwv4dcr7pm0z6s".to_string(),
+                amount: 93454,
+                inputs,
+                fee: 6000,
+                op_return: None,
+                change_address_index: Some(1u32),
+            };
+
+            let mut ks = Keystore::from_private_key(
+                "b0dabbf9ffed224fbca3b41a9e446b3d0b6240c6d2957197a8ab75bbf2e1a5d4",
+                TEST_PASSWORD,
+                CurveType::SECP256k1,
+                Metadata::default(),
+                None,
+            )
+            .unwrap();
+            ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOINCASH.to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            assert_eq!(actual.raw_tx, "0100000001e2986a004630cb451921d9e7b4454a6671e50ddd43ea431c34f6011d9ca4c309000000006a473044022064fb81c11181e6604aa56b29ed65e31680fc1203f5afb6f67c5437f2d68192d9022022282d6c3c35ffdf64a427df5e134aa0edb8528efb6151cb1c3b21422fdfd6e041210251492dfb299f21e426307180b577f927696b6df0b61883215f88eb9685d3d449ffffffff020e6d0100000000001976a9142af4c2c085cd9da90c13cd64c6ae746fa139956e88ac22020000000000001976a914bedf37acf35504c9bfd18b09d989d0fb23fd269688ac00000000");
+        }
+    }
+
+    mod btc {
+        use super::*;
+        use bitcoin::psbt::serialize::Deserialize;
+        use secp256k1::schnorr::Signature;
+        use secp256k1::XOnlyPublicKey;
+
+        #[test]
+        fn test_sign_with_p2wpkh_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let inputs = vec![Utxo {
+                tx_hash: "cebc5c2b4f5533428ad0cca94e9bfefa6410a270ed1d7116e2ee8592494c66bd"
+                    .to_string(),
+                vout: 1,
+                amount: 100000,
+                address: "tb1qrfaf3g4elgykshfgahktyaqj2r593qkrae5v95".to_string(),
+                derived_path: "m/84'/1'/0'/0/0".to_string(),
+            }];
+
+            let tx_input = BtcKinTxInput {
+                inputs: inputs.clone(),
+                to: "tb1p3ax2dfecfag2rlsqewje84dgxj6gp3jkj2nk4e3q9cwwgm93cgesa0zwj4".to_string(),
+                amount: 50000,
+                fee: 20000,
+                change_address_index: Some(53u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+                derivation_path: "m/86'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            //please see https://blockstream.info/testnet/tx/b9d297c17be4fd659959a40fc6df7bf659f5f6e1b46c29d613d6fa25c711616b?expand
+            assert_eq!(actual.raw_tx, "02000000000101bd664c499285eee216711ded70a21064fafe9b4ea9ccd08a4233554f2b5cbcce0100000000ffffffff0250c30000000000002251208f4ca6a7384f50a1fe00cba593d5a834b480c65692a76ae6202e1ce46cb1c23330750000000000002251209303a116174dd21ea473766659568ac24eb6b828c3ee998982d2ba070ea0615502483045022100bed2bc8b4bf2beb4dacda077b47f96b4070af659ca241c343eccfe3ebc4a6f600220379c51f6456adff08a7605496a88653689af9e44f5d324e2ad2e1eae330b434f012102e24f625a31c9a8bae42239f2bf945a306c01a450a03fd123316db0e837a660c000000000");
+            assert_eq!(
+                actual.tx_hash,
+                "b9d297c17be4fd659959a40fc6df7bf659f5f6e1b46c29d613d6fa25c711616b"
+            );
+        }
+
+        #[test]
+        fn test_sign_with_taproot_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let inputs = vec![Utxo {
+                tx_hash: "2bdcfa88d5f48954e98018da33aaf11a4951b4167ba8121bc787880890dee5f0"
+                    .to_string(),
+                vout: 1,
+                amount: 523000,
+                address: "tb1pjvp6z9shfhfpafrnwen9j452cf8tdwpgc0hfnzvz62aqwr4qv92sg7qj9r"
+                    .to_string(),
+                derived_path: "m/86'/1'/0'/1/53".to_string(),
+            }];
+
+            let tx_input = BtcKinTxInput {
+                inputs: inputs.clone(),
+                to: "tb1p3ax2dfecfag2rlsqewje84dgxj6gp3jkj2nk4e3q9cwwgm93cgesa0zwj4".to_string(),
+                amount: 40000,
+                fee: 1000,
+                change_address_index: Some(53u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+                derivation_path: "m/86'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            //please see https://blockstream.info/testnet/tx/0fb223cd2cd90830827ab235b752de841153d69a75649d8f92ffa2198d645852?expand
+            assert_eq!(
+                actual.tx_hash,
+                "0fb223cd2cd90830827ab235b752de841153d69a75649d8f92ffa2198d645852"
+            );
+        }
+
+        #[test]
+        fn test_sign_with_multi_payment_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let inputs = vec![
+                Utxo {
+                    tx_hash: "aea080afe2cdeb23f0d9f546d386329addda5a6fdc521e02d74d5a4e4461dc4a"
+                        .to_string(),
+                    vout: 0,
+                    amount: 20000,
+                    address: "tb1p3ax2dfecfag2rlsqewje84dgxj6gp3jkj2nk4e3q9cwwgm93cgesa0zwj4"
+                        .to_string(),
+                    derived_path: "m/86'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "aea080afe2cdeb23f0d9f546d386329addda5a6fdc521e02d74d5a4e4461dc4a"
+                        .to_string(),
+                    vout: 1,
+                    amount: 283000,
+                    address: "tb1pjvp6z9shfhfpafrnwen9j452cf8tdwpgc0hfnzvz62aqwr4qv92sg7qj9r"
+                        .to_string(),
+                    derived_path: "m/86'/1'/0'/1/53".to_string(),
+                },
+                Utxo {
+                    tx_hash: "13dca25cc94c015067761f5cecf48dfb3afcaea78abeb28ce1b585bf4980cc12"
+                        .to_string(),
+                    vout: 0,
+                    amount: 100000,
+                    address: "tb1qrfaf3g4elgykshfgahktyaqj2r593qkrae5v95".to_string(),
+                    derived_path: "m/84'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "0122f46a161ded9805d95930549b2e4d93a765ef3dd5f10052c68c9270659e72"
+                        .to_string(),
+                    vout: 1,
+                    amount: 100000,
+                    address: "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB".to_string(),
+                    derived_path: "m/49'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "d8929d60667d2a717abd833828a899795c45c843352b3552322fcd75447226a1"
+                        .to_string(),
+                    vout: 1,
+                    amount: 100000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+            ];
+
+            let tx_input = BtcKinTxInput {
+                inputs: inputs.clone(),
+                to: "tb1pxcrec4q8tzj34phw470pwe5dfkz58k93kljklck6pxpv8yx9v40q66tmr7".to_string(),
+                amount: 40000,
+                fee: 40000,
+                change_address_index: Some(53u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+                derivation_path: "m/86'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            let tx = Transaction::deserialize(&Vec::from_hex(&actual.raw_tx).unwrap()).unwrap();
+
+            let msg = Message::from_slice(
+                &Vec::from_hex("f01ba76b329132e48188ad10d00791647ee6d2f7fee5ef397f3481993c898de3")
+                    .unwrap(),
+            )
+            .unwrap();
+            let sig = Signature::from_slice(&tx.input[0].witness.to_vec()[0]).unwrap();
+            let pub_key = XOnlyPublicKey::from_slice(
+                &Vec::from_hex("8f4ca6a7384f50a1fe00cba593d5a834b480c65692a76ae6202e1ce46cb1c233")
+                    .unwrap(),
+            )
+            .unwrap();
+            assert!(sig.verify(&msg, &pub_key).is_ok());
+
+            let msg = Message::from_slice(
+                &Vec::from_hex("d0691b5ac1b338b9341790ea69417cb454cf346a718342fb4a846dbb8ae142e8")
+                    .unwrap(),
+            )
+            .unwrap();
+            let sig = Signature::from_slice(&tx.input[1].witness.to_vec()[0]).unwrap();
+            let pub_key = XOnlyPublicKey::from_slice(
+                &Vec::from_hex("9303a116174dd21ea473766659568ac24eb6b828c3ee998982d2ba070ea06155")
+                    .unwrap(),
+            )
+            .unwrap();
+            assert!(sig.verify(&msg, &pub_key).is_ok());
+
+            assert_eq!(tx.input[2].witness.to_vec()[0].to_hex(), "3044022022c2feaa4a225496fc6789c969fb776da7378f44c588ad812a7e1227ebe69b6302204fc7bf5107c6d02021fe4833629bc7ab71cefe354026ebd0d9c0da7d4f335f9401");
+            assert_eq!(
+                tx.input[2].witness.to_vec()[1].to_hex(),
+                "02e24f625a31c9a8bae42239f2bf945a306c01a450a03fd123316db0e837a660c0"
+            );
+
+            assert_eq!(tx.input[3].witness.to_vec()[0].to_hex(), "3045022100dec4d3fd189b532ef04f41f68319ff7dc6a7f2351a0a8f98cb7f1ec1f6d71c7a02205e507162669b642fdb480a6c496abbae5f798bce4fd42cc390aa58e3847a1b9101");
+            assert_eq!(
+                tx.input[3].witness.to_vec()[1].to_hex(),
+                "031aee5e20399d68cf0035d1a21564868f22bc448ab205292b4279136b15ecaebc"
+            );
+
+            assert_eq!(tx.input[4].script_sig.to_hex(), "483045022100ca32abc7b180c84cf76907e4e1e0c3f4c0d6e64de23b0708647ac6fee1c04c5b02206e7412a712424eb9406f18e00a42e0dffbfb5901932d1ef97843d9273865550e0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4e");
+
+            //Because of the schnorr signature is not determined, can't compare the raw tx
+            assert_eq!(
+                actual.tx_hash,
+                "2bdcfa88d5f48954e98018da33aaf11a4951b4167ba8121bc787880890dee5f0"
+            );
+        }
+
+        #[test]
+        fn test_sign_with_private_key_on_testnet() {
+            let mut ks = sample_private_key_keystore();
+
+            let inputs = vec![Utxo {
+                tx_hash: "e112b1215813c8888b31a80d215169809f7901359c0f4bf7e7374174ab2a64f4"
+                    .to_string(),
+                vout: 0,
+                amount: 65000000,
+                address: "n2ZNV88uQbede7C5M5jzi6SyG4GVuPpng6".to_string(),
+                derived_path: "".to_string(),
+            }];
+
+            let tx_input = BtcKinTxInput {
+                to: "mxCVgJtD2jSMv2diQVJQAwwq7Cg2wbwpmG".to_string(),
+                amount: MIN_TX_FEE - 1,
+                inputs: inputs.clone(),
+                fee: 1000,
+                change_address_index: Some(0u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input);
+            assert_eq!(
+                actual.err().unwrap().to_string(),
+                "amount_less_than_minimum"
+            );
+
+            let tx_input = BtcKinTxInput {
+                inputs: inputs.clone(),
+                to: "mxCVgJtD2jSMv2diQVJQAwwq7Cg2wbwpmG".to_string(),
+                amount: 63999000,
+                fee: 65000000 - 63999000 - MIN_TX_FEE + 1,
+                change_address_index: Some(0u32),
+                op_return: None,
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            assert_eq!(actual.raw_tx, "0100000001f4642aab744137e7f74b0f9c3501799f806951210da8318b88c8135821b112e1000000006b4830450221009b4a952af51fa057b8e5fb2eb114d0396a0fcbd2912d49c557bb11fc4caa87440220664202cffe79927aaef08aef9a07a60d9cf3f07599b5333d2b31ff2a701974e6012102506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aabaffffffff01188cd003000000001976a914b6fc6ecf55a41b240fd26aaed696624009818d9988ac00000000");
+
+            let tx_input = BtcKinTxInput {
+                to: "mxCVgJtD2jSMv2diQVJQAwwq7Cg2wbwpmG".to_string(),
+                amount: 60000000,
+                inputs: inputs.clone(),
+                fee: 1000000,
+                change_address_index: Some(0u32),
+                op_return: None,
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(actual.raw_tx, "0100000001f4642aab744137e7f74b0f9c3501799f806951210da8318b88c8135821b112e1000000006b483045022100a2d7e684e61df275c35055952a37d0411964caf653172d947475153444ee1c20022038e1219322562864af183c9d4a9a376968b00efb8943ea84475799a23f412a3c012102506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aabaffffffff0200879303000000001976a914b6fc6ecf55a41b240fd26aaed696624009818d9988ac00093d00000000001976a914e6cfaab9a59ba187f0a45db0b169c21bb48f09b388ac00000000");
+        }
+
+        #[test]
+        fn test_sign_with_hd_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let inputs = vec![
+                Utxo {
+                    tx_hash: "983adf9d813a2b8057454cc6f36c6081948af849966f9b9a33e5b653b02f227a"
+                        .to_string(),
+                    vout: 0,
+                    amount: 200000000,
+                    address: "mh7jj2ELSQUvRQELbn9qyA4q5nADhmJmUC".to_string(),
+                    derived_path: "m/44'/1'/0'/0/22".to_string(),
+                },
+                Utxo {
+                    tx_hash: "45ef8ac7f78b3d7d5ce71ae7934aea02f4ece1af458773f12af8ca4d79a9b531"
+                        .to_string(),
+                    vout: 1,
+                    amount: 200000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "14c67e92611dc33df31887bbc468fbbb6df4b77f551071d888a195d1df402ca9"
+                        .to_string(),
+                    vout: 0,
+                    amount: 200000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "117fb6b85ded92e87ee3b599fb0468f13aa0c24b4a442a0d334fb184883e9ab9"
+                        .to_string(),
+                    vout: 1,
+                    amount: 200000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+            ];
+
+            let tx_input = BtcKinTxInput {
+                to: "moLK3tBG86ifpDDTqAQzs4a9cUoNjVLRE3".to_string(),
+                amount: 799988000,
+                inputs: inputs.clone(),
+                fee: 12000,
+                change_address_index: Some(53u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(actual.raw_tx, "01000000047a222fb053b6e5339a9b6f9649f88a9481606cf3c64c4557802b3a819ddf3a98000000006b483045022100c610f77f71cc8afcfbd46df8e3d564fb8fb0f2c041bdf0869512c461901a8ad802206b92460cccbcb2a525877db1b4b7530d9b85e135ce88424d1f5f345dc65b881401210312a0cb31ff52c480c049da26d0aaa600f47e9deee53d02fc2b0e9acf3c20fbdfffffffff31b5a9794dcaf82af1738745afe1ecf402ea4a93e71ae75c7d3d8bf7c78aef45010000006b483045022100dce4a4c3d79bf9392832f68da3cd2daf85ac7fa851402ecc9aaac69b8761941d02201e1fd6601812ea9e39c6df0030cb754d4c578ff48bc9db6072ba5207a4ebc2b60121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffffa92c40dfd195a188d87110557fb7f46dbbfb68c4bb8718f33dc31d61927ec614000000006b483045022100e1802d80d72f5f3be624df3ab668692777188a9255c58067840e4b73a5a61a99022025b23942deb21f5d1959aae85421299ecc9efefb250dbacb46a4130abd538d730121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffffb99a3e8884b14f330d2a444a4bc2a03af16804fb99b5e37ee892ed5db8b67f11010000006a47304402207b82a62ed0d35c9878e6a7946d04679c8a17a8dd0a856b5cc14928fe1e9b554a0220411dd1a61f8ac2a8d7564de84e2c8a2c2583986bd71ac316ade480b8d0b4fffd0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff0120d9ae2f000000001976a91455bdc1b42e3bed851959846ddf600e96125423e088ac00000000");
+
+            let tx_input = BtcKinTxInput {
+                to: "moLK3tBG86ifpDDTqAQzs4a9cUoNjVLRE3".to_string(),
+                amount: 750000000,
+                inputs,
+                fee: 502130,
+                change_address_index: Some(53u32),
+                op_return: None,
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            //see https://mempool.space/testnet/tx/3aa6ed94e29c01b96fe3a20c30825d161f421d5e2358eb1ceade43de533e1977#vin=0
+            assert_eq!(
+                actual.tx_hash,
+                "3aa6ed94e29c01b96fe3a20c30825d161f421d5e2358eb1ceade43de533e1977"
+            );
+            assert_eq!(actual.raw_tx, "01000000047a222fb053b6e5339a9b6f9649f88a9481606cf3c64c4557802b3a819ddf3a98000000006b483045022100c4f39ce7f2448ab8e7154a7b7ce82edd034e3f33e1f917ca43e4aff822ba804c02206dd146d1772a45bb5e51abb081d066114e78bcb504671f61c5a301a647a494ac01210312a0cb31ff52c480c049da26d0aaa600f47e9deee53d02fc2b0e9acf3c20fbdfffffffff31b5a9794dcaf82af1738745afe1ecf402ea4a93e71ae75c7d3d8bf7c78aef45010000006b483045022100d235afda9a56aaa4cbe05df712202e6b1a45aab7a0c83540d3053133f15acc5602201b0e144bec3a02a5c556596040b0be81b0202c19b163bb537b8d965afd61403a0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffffa92c40dfd195a188d87110557fb7f46dbbfb68c4bb8718f33dc31d61927ec614000000006b483045022100dd8f1e20116f96a3400f55e0c637a0ad21ae47ff92d83ffb0c3d324c684a54be0220064b0a6d316154ef07a69bd82de3a052e43c3c6bb0e55e4de4de939b093e1a3a0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffffb99a3e8884b14f330d2a444a4bc2a03af16804fb99b5e37ee892ed5db8b67f11010000006a473044022048d8cb0f1480174b3b9186cc6fe410db765f1f9d3ce036b0d4dee0eb19aa3641022073de4bb2b00a0533e9c8f3e074c655e0695c8b223233ddecf3c99a84351d50a60121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff028017b42c000000001976a91455bdc1b42e3bed851959846ddf600e96125423e088ac0e47f302000000001976a91412967cdd9ceb72bbdbb7e5db85e2dbc6d6c3ab1a88ac00000000");
+        }
+
+        #[test]
+        fn test_sign_op_return_with_hd_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let unspent = vec![
+                Utxo {
+                    tx_hash: "983adf9d813a2b8057454cc6f36c6081948af849966f9b9a33e5b653b02f227a"
+                        .to_string(),
+                    vout: 0,
+                    amount: 200000000,
+                    address: "mh7jj2ELSQUvRQELbn9qyA4q5nADhmJmUC".to_string(),
+                    derived_path: "m/44'/1'/0'/0/22".to_string(),
+                },
+                Utxo {
+                    tx_hash: "45ef8ac7f78b3d7d5ce71ae7934aea02f4ece1af458773f12af8ca4d79a9b531"
+                        .to_string(),
+                    vout: 1,
+                    amount: 200000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "14c67e92611dc33df31887bbc468fbbb6df4b77f551071d888a195d1df402ca9"
+                        .to_string(),
+                    vout: 0,
+                    amount: 200000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "117fb6b85ded92e87ee3b599fb0468f13aa0c24b4a442a0d334fb184883e9ab9"
+                        .to_string(),
+                    vout: 1,
+                    amount: 200000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+            ];
+
+            let tx_input = BtcKinTxInput {
+                to: "moLK3tBG86ifpDDTqAQzs4a9cUoNjVLRE3".to_string(),
+                amount: 799988000,
+                inputs: unspent,
+                fee: 12000,
+                change_address_index: Some(53u32),
+                op_return: Some("1234".to_string()),
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            assert_eq!(actual.raw_tx, "01000000047a222fb053b6e5339a9b6f9649f88a9481606cf3c64c4557802b3a819ddf3a98000000006a473044022018bdc26d15552ddda446a07212c1cffcc259a51830a347b379c842d4823f76330220239a54e93e315778adcb2d96eb32688594764c471ceb28c811a4300916a875a901210312a0cb31ff52c480c049da26d0aaa600f47e9deee53d02fc2b0e9acf3c20fbdfffffffff31b5a9794dcaf82af1738745afe1ecf402ea4a93e71ae75c7d3d8bf7c78aef45010000006b483045022100ee3f5a4acbf595ccdeae6c7f31ed51c3595c5814b1098345db94b85fd4e681030220412a0f8da13a9df4447018637b0fe31d11a795b2c1f8174128d2fd0608269f9b0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffffa92c40dfd195a188d87110557fb7f46dbbfb68c4bb8718f33dc31d61927ec614000000006b483045022100f4be2b77fe1cb152e2c1868cedd4e3cf8f6af5b73b10fb4ba8ea95b279f10a37022023227ff8efde2a1dd72e4363fb75e3da80ae6c4f6c66cdf66e55b835c54549640121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffffb99a3e8884b14f330d2a444a4bc2a03af16804fb99b5e37ee892ed5db8b67f11010000006b483045022100a2561e13c430c8d136c13de0f34913e9c5c1d26f8b577a2fe206b9285538020f02204af7501eab7c562f868e5369fddc93f654fa80227166104a4ac11cf43cfe2caf0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff0220d9ae2f000000001976a91455bdc1b42e3bed851959846ddf600e96125423e088ac0000000000000000046a02123400000000")
+        }
+
+        #[test]
+        fn test_sign_p2shwpkh_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let unspent = vec![
+                Utxo {
+                    tx_hash: "c2ceb5088cf39b677705526065667a3992c68cc18593a9af12607e057672717f"
+                        .to_string(),
+                    vout: 0,
+                    amount: 50000,
+                    address: "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB".to_string(),
+                    derived_path: "m/49'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "9ad628d450952a575af59f7d416c9bc337d184024608f1d2e13383c44bd5cd74"
+                        .to_string(),
+                    vout: 0,
+                    amount: 50000,
+                    address: "2N54wJxopnWTvBfqgAPVWqXVEdaqoH7Suvf".to_string(),
+                    derived_path: "m/49'/1'/0'/0/1".to_string(),
+                },
+            ];
+
+            let tx_input = BtcKinTxInput {
+                to: "2N9wBy6f1KTUF5h2UUeqRdKnBT6oSMh4Whp".to_string(),
+                amount: 88000,
+                inputs: unspent.clone(),
+                fee: 12000,
+                change_address_index: Some(0u32),
+                op_return: None,
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            assert_eq!(actual.raw_tx, "020000000001027f717276057e6012afa99385c18cc692397a666560520577679bf38c08b5cec20000000017160014654fbb08267f3d50d715a8f1abb55979b160dd5bffffffff74cdd54bc48333e1d2f108460284d137c39b6c417d9ff55a572a9550d428d69a00000000171600149d66aa6399de69d5c5ae19f9098047760251a854ffffffff01c05701000000000017a914b710f6e5049eaf0404c2f02f091dd5bb79fa135e870247304402205fd9dea5df0db5cc7b1d4b969f63b4526fb00fd5563ab91012cb511744a53d570220784abfe099a2b063b1cfc1f145fef2ffcb100b0891514fa164d357f0ef7ca6bb0121031aee5e20399d68cf0035d1a21564868f22bc448ab205292b4279136b15ecaebc02483045022100b0246c12428dbf863fcc9060ab6fc46dc2135adaa6cf8117de49f9acecaccf6c022059377d05c9cab24b7dec14242ea3206cc1f464d5ff9904dca515fc71766507cd012103a241c8d13dd5c92475652c43bf56580fbf9f1e8bc0aa0132ddc8443c03062bb900000000");
+
+            let tx_input = BtcKinTxInput {
+                to: "2N9wBy6f1KTUF5h2UUeqRdKnBT6oSMh4Whp".to_string(),
+                amount: 80000,
+                inputs: unspent.clone(),
+                fee: 10000,
+                change_address_index: Some(0u32),
+                op_return: None,
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            assert_eq!(actual.raw_tx, "020000000001027f717276057e6012afa99385c18cc692397a666560520577679bf38c08b5cec20000000017160014654fbb08267f3d50d715a8f1abb55979b160dd5bffffffff74cdd54bc48333e1d2f108460284d137c39b6c417d9ff55a572a9550d428d69a00000000171600149d66aa6399de69d5c5ae19f9098047760251a854ffffffff02803801000000000017a914b710f6e5049eaf0404c2f02f091dd5bb79fa135e87102700000000000017a914755fba51b5c443b9f16b1f86665dec10dd7a25c58702483045022100f0c66cd322e50f992ad34448fb3bf823066e5ffaa8e840a901058a863a4d950c02206cdafb1ad1ef4d938122b106069d8b435387e4d55711f50a46a8d91d9f674c550121031aee5e20399d68cf0035d1a21564868f22bc448ab205292b4279136b15ecaebc02483045022100cfe92e4ad4fbfc13be20afc6f37429e26426257d015b409d28c260544e581b2c022028412816d1fef11093b474c2c662a25a4062f4e37d06ce66207863de98814a07012103a241c8d13dd5c92475652c43bf56580fbf9f1e8bc0aa0132ddc8443c03062bb900000000");
+        }
+
+        #[test]
+        fn test_sign_segwit_with_op_return_on_testnet() {
+            let mut ks = sample_hd_keystore();
+
+            let unspent = vec![
+                Utxo {
+                    tx_hash: "c2ceb5088cf39b677705526065667a3992c68cc18593a9af12607e057672717f"
+                        .to_string(),
+                    vout: 0,
+                    amount: 50000,
+                    address: "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB".to_string(),
+                    derived_path: "m/49'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "9ad628d450952a575af59f7d416c9bc337d184024608f1d2e13383c44bd5cd74"
+                        .to_string(),
+                    vout: 0,
+                    amount: 50000,
+                    address: "2N54wJxopnWTvBfqgAPVWqXVEdaqoH7Suvf".to_string(),
+                    derived_path: "m/49'/1'/0'/0/1".to_string(),
+                },
+            ];
+
+            let tx_input = BtcKinTxInput {
+                to: "2N9wBy6f1KTUF5h2UUeqRdKnBT6oSMh4Whp".to_string(),
+                amount: 88000,
+                inputs: unspent.clone(),
+                fee: 12000,
+                change_address_index: Some(0u32),
+                op_return: Some("1234".to_string()),
+            };
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "TESTNET".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+
+            assert_eq!(actual.raw_tx, "020000000001027f717276057e6012afa99385c18cc692397a666560520577679bf38c08b5cec20000000017160014654fbb08267f3d50d715a8f1abb55979b160dd5bffffffff74cdd54bc48333e1d2f108460284d137c39b6c417d9ff55a572a9550d428d69a00000000171600149d66aa6399de69d5c5ae19f9098047760251a854ffffffff02c05701000000000017a914b710f6e5049eaf0404c2f02f091dd5bb79fa135e870000000000000000046a021234024730440220527c098c320c54ac56445b757a76833f7a47229fa0fe2b179f55bd718822695e022060f48b05c46f8335266eade0fe503448ff4222efc7e84ef86a25abffbe02ead20121031aee5e20399d68cf0035d1a21564868f22bc448ab205292b4279136b15ecaebc024730440220551ab42b94841b43e6118a6adb39a561f138ae9ee8d2c00ffa3886839afe66d2022046686666245b94b7272d7cbd17a6f20639532ddefafe0572ecc28dcb246d33f8012103a241c8d13dd5c92475652c43bf56580fbf9f1e8bc0aa0132ddc8443c03062bb900000000");
+        }
+    }
+
+    mod ltc {
+        use super::*;
+
+        #[test]
+        fn test_sign_with_hd_on_testnet() {
+            let inputs = vec![Utxo {
+                tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101"
+                    .to_string(),
+                vout: 0,
+                amount: 1000000,
+                address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                derived_path: "m/44'/1'/0'/0/0".to_string(),
+            }];
+            let tx_input = BtcKinTxInput {
+                to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
+                amount: 100000,
+                inputs,
+                fee: 5902,
+                change_address_index: None,
+                op_return: None,
+            };
+
+            let mut keystore = sample_hd_keystore();
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: LITECOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = keystore.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(
+                actual.tx_hash,
+                "e15054b5a45400796fe3f8605c7dd84ff6ec7e08f444969ba24fa1c285d10df9"
+            );
+            assert_eq!(actual.raw_tx, "010000000101a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006b48304502210090beb741ec38b0931a457c40086ba183c0cc85542bce5e5811a2377e954a113b022029a37ba9ccfe57fc77f639c7599d4fcf35f2fb921a610967a88dba0a800ee9ae0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff02a0860100000000001976a914461bf9360ec1bc9fe438df19ef36c7c2bb26ef8288ac92a40d00000000001976a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac00000000");
+        }
+
+        #[test]
+        fn test_sign_multi_utxo_with_hd_on_testnet() {
+            let inputs = vec![
+                Utxo {
+                    tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101"
+                        .to_string(),
+                    vout: 0,
+                    amount: 1000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+                Utxo {
+                    tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a100"
+                        .to_string(),
+                    vout: 0,
+                    amount: 1000000,
+                    address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                    derived_path: "m/44'/1'/0'/0/0".to_string(),
+                },
+            ];
+            let tx_input = BtcKinTxInput {
+                to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
+                amount: 1100000,
+                inputs,
+                fee: 5902,
+                change_address_index: Some(1u32),
+                op_return: None,
+            };
+
+            let mut keystore = sample_hd_keystore();
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: LITECOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = keystore.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(
+                actual.tx_hash,
+                "c8d5b9bda8a43a8cc04b1271c2fd5d92d45ed00b2a64193f531ee0f05f3afe96"
+            );
+
+            assert_eq!(actual.raw_tx, "010000000201a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006b483045022100a49798664e490075f9d111c6b6e8541781a5a88df1b95eb910dd307298ead4e802203adb4a21f2e680e1d05f6346ec25b1077f60e58c6289606cc9dad15698b5368d0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff00a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006a473044022100c7e2dba307022d45067e7b3eceb2b288f49037f43c8bac271ccc831f250b9438021f14103613f41f6d6811f70359077ae96dc2055fcb9dd5aff21469e1fb51a9870121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff02e0c81000000000001976a914461bf9360ec1bc9fe438df19ef36c7c2bb26ef8288ac92a40d00000000001976a9143770c8c6671d27e2a9f4502d74932bf740c1ff8688ac00000000");
+        }
+
+        #[test]
+        fn test_wrong_derived_path() {
+            let inputs = vec![Utxo {
+                tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101"
+                    .to_string(),
+                vout: 0,
+                amount: 1000000,
+                address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                derived_path: "m/44'/1'/0'/0/2".to_string(),
+            }];
+            let tx_input = BtcKinTxInput {
+                to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
+                amount: 100000,
+                inputs,
+                fee: 5902,
+                change_address_index: None,
+                op_return: None,
+            };
+
+            let mut keystore = sample_hd_keystore();
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: LITECOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let actual = keystore.sign_transaction(&params, &tx_input).unwrap();
+            assert_ne!(
+                actual.tx_hash,
+                "f90dd185c2a14fa29b9644f4087eecf64fd87d5c60f8e36f790054a4b55450e1"
+            );
+            assert_ne!(actual.raw_tx, "010000000101a1d4a6b051e732341c0101a62488051bb5bf969d1f15324bbf6a1d2035c957000000006b48304502210090beb741ec38b0931a457c40086ba183c0cc85542bce5e5811a2377e954a113b022029a37ba9ccfe57fc77f639c7599d4fcf35f2fb921a610967a88dba0a800ee9ae0121033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4effffffff02a0860100000000001976a914461bf9360ec1bc9fe438df19ef36c7c2bb26ef8288ac92a40d00000000001976a914383fb81cb0a3fc724b5e08cf8bbd404336d711f688ac00000000");
+        }
+
+        #[test]
+        fn test_invalid_derived_path() {
+            let inputs = vec![Utxo {
+                tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101"
+                    .to_string(),
+                vout: 0,
+                amount: 1000000,
+                address: "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN".to_string(),
+                derived_path: "hello//ggg".to_string(),
+            }];
+            let tx_input = BtcKinTxInput {
+                to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
+                amount: 100000,
+                inputs,
+                fee: 5902,
+                change_address_index: None,
+                op_return: None,
+            };
+
+            let mut keystore = sample_hd_keystore();
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: LITECOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+            let ret = keystore.sign_transaction(&params, &tx_input);
+            assert!(ret.is_err());
+            assert_eq!(
+                format!("{}", ret.err().unwrap()),
+                "invalid child number format"
+            );
+        }
+
+        #[test]
+        fn test_sign_invalid_unspent_address() {
+            let inputs = vec![Utxo {
+                tx_hash: "57c935201d6abf4b32151f9d96bfb51b058824a601011c3432e751b0a6d4a101"
+                    .to_string(),
+                vout: 0,
+                amount: 1000000,
+                address: "invalid_address".to_string(),
+                derived_path: "0/0".to_string(),
+            }];
+            let tx_input = BtcKinTxInput {
+                to: "mmuf77YiGckWgfvd32viaj7EKfrUN1FdAz".to_string(),
+                amount: 100000,
+                inputs,
+                fee: 5902,
+                change_address_index: None,
+                op_return: None,
+            };
+
+            let mut keystore = sample_hd_keystore();
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: LITECOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+            let ret = keystore.sign_transaction(&params, &tx_input);
+            assert!(ret.is_err());
+        }
+
+        #[test]
+        fn test_sign_amount_great_than_inputs() {
+            // amount great than inputs
+            let inputs = vec![Utxo {
+                tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458"
+                    .to_string(),
+                vout: 0,
+                amount: 1000000,
+                address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
+                derived_path: "0/0".to_string(),
+            }];
+            let _coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
+            let tx_input = BtcKinTxInput {
+                to: "mrU9pEmAx26HcbKVrABvgL7AwA5fjNFoDc".to_string(),
+                amount: 1500000,
+                inputs,
+                fee: 100000,
+                change_address_index: None,
+                op_return: None,
+            };
+
+            let _ks = wif_keystore("cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY");
+            let prv_key = Secp256k1PrivateKey::from_wif(
+                "cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY",
+            )
+            .unwrap()
+            .to_bytes()
+            .to_hex();
+
+            let mut keystore = Keystore::from_private_key(
+                &prv_key,
+                TEST_PASSWORD,
+                CurveType::SECP256k1,
+                Metadata::default(),
+                None,
+            )
+            .unwrap();
+            let _coin_info = coin_info_from_param("LITECOIN", "TESTNET", "NONE", "").unwrap();
+            let _ = keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: LITECOIN.to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+            };
+
+            let ret = keystore.sign_transaction(&params, &tx_input);
+            assert!(ret.is_err());
+            assert_eq!(
+                format!("{}", ret.err().unwrap()),
+                "total amount must ge amount + fee"
+            );
+        }
+
+        #[test]
+        fn test_sign_invalid_address() {
+            let chain_types = vec!["BITCOINCASH", "LITECOIN"];
+            for _chain_type in chain_types {
+                let inputs = vec![Utxo {
+                    tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458"
+                        .to_string(),
+                    vout: 0,
+                    amount: 1000000,
+                    address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
+                    derived_path: "0/0".to_string(),
+                }];
+                let tx_input = BtcKinTxInput {
+                    to: "invalid_address".to_string(),
+                    amount: 500000,
+                    inputs,
+                    fee: 100000,
+                    change_address_index: None,
+                    op_return: None,
+                };
+
+                let mut ks = wif_keystore("mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1");
+
+                let params = SignatureParameters {
+                    curve: CurveType::SECP256k1,
+                    derivation_path: "".to_string(),
+                    chain_type: "".to_string(),
+                    network: "".to_string(),
+                    seg_wit: "".to_string(),
+                };
+
+                let ret = ks.sign_transaction(&params, &tx_input);
+                assert!(ret.is_err());
+            }
+        }
+
+        #[test]
+        fn test_sign_segwit() {
+            let inputs = vec![Utxo {
+                tx_hash: "e868b66e75376add2154acb558cf45ff7b723f255e2aca794da1548eb945ba8b"
+                    .to_string(),
+                vout: 1,
+                amount: 19850000,
+                address: "MV3hqxhhcGxCdeLXpZKRCabtUApRXixgid".to_string(),
+                derived_path: "1/0".to_string(),
+            }];
+            let tx_input = BtcKinTxInput {
+                to: "M7xo1Mi1gULZSwgvu7VVEvrwMRqngmFkVd".to_string(),
+                amount: 19800000,
+                inputs,
+                fee: 50000,
+                change_address_index: None,
+                op_return: None,
+            };
+            let mut ks =
+                hex_keystore("f3731f49d830c109e054522df01a9378383814af5b01a9cd150511f12db39e6e");
+
+            let params = SignatureParameters {
+                curve: CurveType::SECP256k1,
+                chain_type: BITCOIN.to_string(),
+                network: "MAINNET".to_string(),
+                derivation_path: "m/44'/0'/0'/0/0".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            };
+
+            let actual = ks.sign_transaction(&params, &tx_input).unwrap();
+            assert_eq!(actual.raw_tx, "020000000001018bba45b98e54a14d79ca2a5e253f727bff45cf58b5ac5421dd6a37756eb668e801000000171600147b03478d2f7c984179084baa38f790ed1d37629bffffffff01c01f2e010000000017a91400aff21f24bc08af58e41e4186d8492a10b84f9e8702483045022100d0cc3d94c7b7b34fdcc2adc4fd3f735560407581afd6caa11c8d04b963a048a00220777d98e0122fe97206875f49556a401dfc449739ec30e44cb9ed9b92a0b3ff1b01210209c629c64829ec2e99703600ee86c7161a9ed13213e714726210274c29cf780900000000");
+        }
+    }
+}
diff --git a/token-core/tcx-btc-kin/src/transaction.rs b/token-core/tcx-btc-kin/src/transaction.rs
new file mode 100644
index 00000000..2b237ead
--- /dev/null
+++ b/token-core/tcx-btc-kin/src/transaction.rs
@@ -0,0 +1,55 @@
+/// FUNCTION: sign_tx(SignParam{input: BtcKinTxInput}): BtcKinTxOutput
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Utxo {
+    #[prost(string, tag = "1")]
+    pub tx_hash: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub vout: u32,
+    #[prost(uint64, tag = "3")]
+    pub amount: u64,
+    #[prost(string, tag = "4")]
+    pub address: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub derived_path: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BtcKinTxInput {
+    #[prost(message, repeated, tag = "1")]
+    pub inputs: ::prost::alloc::vec::Vec<Utxo>,
+    #[prost(string, tag = "2")]
+    pub to: ::prost::alloc::string::String,
+    #[prost(uint64, tag = "3")]
+    pub amount: u64,
+    #[prost(uint64, tag = "4")]
+    pub fee: u64,
+    #[prost(string, optional, tag = "5")]
+    pub op_return: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(uint32, optional, tag = "6")]
+    pub change_address_index: ::core::option::Option<u32>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BtcKinTxOutput {
+    #[prost(string, tag = "1")]
+    pub raw_tx: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub tx_hash: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub wtx_hash: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct OmniTxInput {
+    #[prost(message, repeated, tag = "1")]
+    pub inputs: ::prost::alloc::vec::Vec<Utxo>,
+    #[prost(string, tag = "2")]
+    pub to: ::prost::alloc::string::String,
+    #[prost(uint64, tag = "3")]
+    pub amount: u64,
+    #[prost(uint64, tag = "4")]
+    pub fee: u64,
+    #[prost(uint32, tag = "5")]
+    pub property_id: u32,
+}
diff --git a/token-core/tcx-chain/Cargo.toml b/token-core/tcx-chain/Cargo.toml
deleted file mode 100644
index c07898a0..00000000
--- a/token-core/tcx-chain/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "tcx-chain"
-version = "0.1.0"
-authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
-
-[dependencies]
-tcx-crypto = { path = "../tcx-crypto" }
-tcx-primitive = { path = "../tcx-primitive" }
-tcx-constants = { path = "../tcx-constants" }
-
-bitcoin = "0.29.2"
-byteorder = "1.4.3"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-bip39 = "0.7.3"
-bitcoin_hashes = "0.11.0"
-uuid = { version = "1.2.2", features = ["serde", "v4"] }
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.88"
-failure = "0.1.8"
-regex = "1.7.0"
-hex = "0.4.3"
-
-prost = "0.11.2"
-bytes = "1.3.0"
-
-[dev-dependencies.cargo-husky]
-version = "1"
-default-features = false
-features = ["precommit-hook", "run-cargo-fmt"]
-
-
-[features]
-default = []
-cache_dk = []
\ No newline at end of file
diff --git a/token-core/tcx-chain/src/keystore/guard.rs b/token-core/tcx-chain/src/keystore/guard.rs
deleted file mode 100644
index e355b42a..00000000
--- a/token-core/tcx-chain/src/keystore/guard.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use super::Keystore;
-use super::Result;
-
-pub struct KeystoreGuard<'a> {
-    keystore: &'a mut Keystore,
-}
-
-impl<'a> Drop for KeystoreGuard<'a> {
-    fn drop(&mut self) {
-        self.keystore.lock();
-    }
-}
-
-impl<'a> KeystoreGuard<'a> {
-    pub fn unlock_by_password(ks: &'a mut Keystore, password: &str) -> Result<KeystoreGuard<'a>> {
-        ks.unlock_by_password(password)?;
-
-        Ok(KeystoreGuard { keystore: ks })
-    }
-
-    pub fn unlock_by_derived_key(
-        ks: &'a mut Keystore,
-        derived_key: &str,
-    ) -> Result<KeystoreGuard<'a>> {
-        ks.unlock_by_derived_key(derived_key)?;
-
-        Ok(KeystoreGuard { keystore: ks })
-    }
-
-    pub fn keystore_mut(&mut self) -> &mut Keystore {
-        self.keystore
-    }
-
-    pub fn keystore(&self) -> &Keystore {
-        self.keystore
-    }
-}
diff --git a/token-core/tcx-chain/src/keystore/hd.rs b/token-core/tcx-chain/src/keystore/hd.rs
deleted file mode 100644
index 06c3dd10..00000000
--- a/token-core/tcx-chain/src/keystore/hd.rs
+++ /dev/null
@@ -1,416 +0,0 @@
-use bip39::{Language, Mnemonic, Seed};
-
-use uuid::Uuid;
-
-use super::Account;
-use super::Address;
-use super::Result;
-use super::{Error, Metadata};
-
-use crate::keystore::{transform_mnemonic_error, Store};
-
-use std::collections::HashMap;
-
-use tcx_constants::{CoinInfo, CurveType};
-use tcx_crypto::hash::dsha256;
-use tcx_crypto::{Crypto, Key, Pbkdf2Params};
-use tcx_primitive::{
-    generate_mnemonic, get_account_path, Derive, ToHex, TypedDeterministicPrivateKey,
-    TypedDeterministicPublicKey, TypedPrivateKey,
-};
-
-struct Cache {
-    mnemonic: String,
-    keys: HashMap<String, TypedDeterministicPrivateKey>,
-}
-
-pub struct HdKeystore {
-    store: Store,
-    cache: Option<Cache>,
-}
-
-pub fn key_hash_from_mnemonic(mnemonic: &str) -> Result<String> {
-    let mn =
-        Mnemonic::from_phrase(mnemonic, Language::English).map_err(transform_mnemonic_error)?;
-
-    let seed = Seed::new(&mn, "");
-
-    let bytes = dsha256(seed.as_bytes())[..20].to_vec();
-    Ok(hex::encode(bytes))
-}
-
-impl HdKeystore {
-    pub const VERSION: i64 = 11000i64;
-
-    pub(crate) fn store(&self) -> &Store {
-        &self.store
-    }
-
-    pub(crate) fn store_mut(&mut self) -> &mut Store {
-        &mut self.store
-    }
-
-    pub(crate) fn from_store(store: Store) -> Self {
-        HdKeystore { store, cache: None }
-    }
-
-    pub(crate) fn unlock_by_password(&mut self, password: &str) -> Result<()> {
-        let mnemonic_bytes = self
-            .store
-            .crypto
-            .decrypt(Key::Password(password.to_owned()))?;
-        self.cache_mnemonic(mnemonic_bytes)
-    }
-
-    pub(crate) fn unlock_by_derived_key(&mut self, derived_key: &str) -> Result<()> {
-        let mnemonic_bytes = self
-            .store
-            .crypto
-            .decrypt(Key::DerivedKey(derived_key.to_owned()))?;
-        self.cache_mnemonic(mnemonic_bytes)
-    }
-
-    fn cache_mnemonic(&mut self, mnemonic_bytes: Vec<u8>) -> Result<()> {
-        let mnemonic_str = String::from_utf8(mnemonic_bytes)?;
-
-        let _mnemonic = Mnemonic::from_phrase(&mnemonic_str, Language::English)
-            .map_err(transform_mnemonic_error)?;
-
-        self.cache = Some(Cache {
-            mnemonic: mnemonic_str,
-            keys: HashMap::new(),
-        });
-
-        Ok(())
-    }
-
-    pub(crate) fn lock(&mut self) {
-        self.cache = None;
-    }
-
-    pub(crate) fn is_locked(&self) -> bool {
-        self.cache.is_none()
-    }
-
-    pub(crate) fn mnemonic(&self) -> Result<String> {
-        let cache = self.cache.as_ref().ok_or(Error::KeystoreLocked)?;
-
-        Ok(cache.mnemonic.to_string())
-    }
-
-    pub(crate) fn find_private_key(&self, symbol: &str, address: &str) -> Result<TypedPrivateKey> {
-        let cache = self.cache.as_ref().ok_or(Error::KeystoreLocked)?;
-
-        let account = self
-            .account(symbol, address)
-            .ok_or(Error::AccountNotFound)?;
-
-        let root = TypedDeterministicPrivateKey::from_mnemonic(account.curve, &cache.mnemonic)?;
-
-        Ok(root.derive(&account.derivation_path)?.private_key())
-    }
-
-    pub(crate) fn find_deterministic_public_key(
-        &mut self,
-        symbol: &str,
-        address: &str,
-    ) -> Result<TypedDeterministicPublicKey> {
-        let account = self
-            .account(symbol, address)
-            .ok_or(Error::AccountNotFound)?;
-
-        TypedDeterministicPublicKey::from_hex(account.curve, &account.ext_pub_key)
-    }
-
-    pub(crate) fn find_private_key_by_path(
-        &mut self,
-        symbol: &str,
-        main_address: &str,
-        relative_path: &str,
-    ) -> Result<TypedPrivateKey> {
-        let cache = self.cache.as_ref().ok_or(Error::KeystoreLocked)?;
-
-        if !cache.keys.contains_key(main_address) {
-            let account = self
-                .account(symbol, main_address)
-                .ok_or(Error::AccountNotFound)?;
-
-            let esk = TypedDeterministicPrivateKey::from_mnemonic(account.curve, &cache.mnemonic)?;
-
-            let k = esk.derive(&get_account_path(&account.derivation_path)?)?;
-
-            self.cache
-                .as_mut()
-                .unwrap()
-                .keys
-                .insert(main_address.to_owned(), k);
-        }
-
-        let esk = &self.cache.as_ref().unwrap().keys[main_address];
-
-        Ok(esk.derive(relative_path)?.private_key())
-    }
-
-    pub fn new(password: &str, meta: Metadata) -> HdKeystore {
-        let mnemonic = generate_mnemonic();
-
-        Self::from_mnemonic(&mnemonic, password, meta).unwrap()
-    }
-
-    pub fn from_mnemonic(mnemonic: &str, password: &str, meta: Metadata) -> Result<HdKeystore> {
-        let mnemonic: &str = &mnemonic.split_whitespace().collect::<Vec<&str>>().join(" ");
-
-        let key_hash = key_hash_from_mnemonic(mnemonic)?;
-
-        let crypto: Crypto<Pbkdf2Params> = Crypto::new(password, mnemonic.as_bytes());
-        Ok(HdKeystore {
-            store: Store {
-                key_hash,
-                crypto,
-                id: Uuid::new_v4().as_hyphenated().to_string(),
-                version: Self::VERSION,
-                active_accounts: vec![],
-                meta,
-            },
-
-            cache: None,
-        })
-    }
-
-    pub(crate) fn derive_coin<A: Address>(&mut self, coin_info: &CoinInfo) -> Result<Account> {
-        let cache = self.cache.as_ref().ok_or(Error::KeystoreLocked)?;
-
-        let root = TypedDeterministicPrivateKey::from_mnemonic(coin_info.curve, &cache.mnemonic)?;
-
-        let private_key = root.derive(&coin_info.derivation_path)?.private_key();
-        let public_key = private_key.public_key();
-
-        let address = A::from_public_key(&public_key, coin_info)?;
-        // todo: ext_pub_key
-        let ext_pub_key = match coin_info.curve {
-            CurveType::SubSr25519 | CurveType::BLS | CurveType::ED25519 => "".to_owned(),
-            _ => root
-                .derive(&get_account_path(&coin_info.derivation_path)?)?
-                .deterministic_public_key()
-                .to_hex(),
-        };
-        // let ext_pub_key = root
-        //     .derive(&account_path)?
-        //     .deterministic_public_key()
-        //     .to_hex();
-
-        let account = Account {
-            address,
-            derivation_path: coin_info.derivation_path.to_string(),
-            curve: coin_info.curve,
-            coin: coin_info.coin.to_string(),
-            network: coin_info.network.to_string(),
-            ext_pub_key,
-            seg_wit: coin_info.seg_wit.to_string(),
-            public_key: Some(hex::encode(public_key.to_bytes())),
-        };
-
-        if let Some(_) = self
-            .store
-            .active_accounts
-            .iter()
-            .find(|x| x.address == account.address && x.coin == account.coin)
-        {
-            return Ok(account);
-        } else {
-            self.store.active_accounts.push(account.clone());
-            Ok(account)
-        }
-    }
-
-    pub(crate) fn account(&self, symbol: &str, address: &str) -> Option<&Account> {
-        self.store
-            .active_accounts
-            .iter()
-            .find(|acc| acc.address == address && acc.coin == symbol)
-    }
-
-    pub(crate) fn verify_password(&self, password: &str) -> bool {
-        self.store.crypto.verify_password(password)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::keystore::metadata_default_time;
-
-    use crate::Source;
-    use std::string::ToString;
-    use tcx_constants::{CurveType, TEST_MNEMONIC, TEST_PASSWORD};
-    use tcx_primitive::TypedPublicKey;
-
-    // A mnemonic word separated by a full-width or half-width space
-    static MNEMONIC_WITH_WHITESPACE: &'static str =
-        "inject　 kidney    empty   canal shadow   pact comfort wife crush horse wife sketch";
-    static INVALID_MNEMONIC1: &'static str =
-        "inject kidney empty canal shadow pact comfort wife crush horse wife inject";
-    static INVALID_MNEMONIC2: &'static str =
-        "invalid_word kidney empty canal shadow pact comfort wife crush horse wife sketch";
-    static INVALID_MNEMONIC_LEN: &'static str =
-        "inject kidney empty canal shadow pact comfort wife crush horse wife";
-    #[test]
-    pub fn default_meta() {
-        let meta = Metadata::default();
-        let expected = Metadata {
-            name: String::from("Unknown"),
-            password_hint: String::new(),
-            timestamp: metadata_default_time(),
-            source: Source::Mnemonic,
-        };
-
-        assert_eq!(meta.name, expected.name);
-        assert_eq!(meta.password_hint, expected.password_hint);
-        assert_eq!(meta.source, expected.source);
-    }
-
-    struct MockAddress {}
-    impl Address for MockAddress {
-        fn from_public_key(_pk: &TypedPublicKey, _coin: &CoinInfo) -> Result<String> {
-            Ok("mock_address".to_string())
-        }
-
-        fn is_valid(_address: &str, _coin: &CoinInfo) -> bool {
-            true
-        }
-    }
-
-    #[test]
-    pub fn new_keystore() {
-        let keystore = HdKeystore::new(TEST_PASSWORD, Metadata::default());
-        let store = keystore.store;
-
-        assert_eq!(store.version, 11000);
-        assert_ne!(store.id, "");
-        assert_eq!(store.active_accounts.len(), 0);
-    }
-
-    #[test]
-    pub fn from_invalid_mnemonic() {
-        let invalid_mnemonic = vec![
-            (INVALID_MNEMONIC1, "mnemonic_checksum_invalid"),
-            (INVALID_MNEMONIC2, "mnemonic_word_invalid"),
-            (INVALID_MNEMONIC_LEN, "mnemonic_length_invalid"),
-        ];
-        for (mn, err) in invalid_mnemonic {
-            let ks = HdKeystore::from_mnemonic(mn, TEST_PASSWORD, Metadata::default());
-            assert!(ks.is_err());
-            assert_eq!(err, format!("{}", ks.err().unwrap()));
-        }
-    }
-
-    #[test]
-    pub fn from_blank_space_mnemonic() {
-        let mut keystore =
-            HdKeystore::from_mnemonic(MNEMONIC_WITH_WHITESPACE, TEST_PASSWORD, Metadata::default())
-                .unwrap();
-        let coin_info = CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/44'/0'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let _ = keystore.unlock_by_password(TEST_PASSWORD).unwrap();
-
-        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
-
-        let expected = Account {
-            address: "mock_address".to_string(),
-            derivation_path: "m/44'/0'/0'/0/0".to_string(),
-            ext_pub_key: "03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77".to_string(),
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-            curve: CurveType::SECP256k1,
-            coin: "BITCOIN".to_string(),
-            public_key: Some("026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868".to_string())
-        };
-
-        assert_eq!(acc, expected);
-        assert_eq!(
-            keystore.account("BITCOIN", "mock_address").unwrap(),
-            &expected
-        );
-    }
-
-    #[test]
-    pub fn from_mnemonic() {
-        let mut keystore =
-            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
-        assert_eq!(keystore.store.version, 11000);
-        assert_ne!(keystore.store.id, "");
-        let decrypted_bytes = keystore
-            .store
-            .crypto
-            .decrypt(Key::Password(TEST_PASSWORD.to_owned()))
-            .unwrap();
-        let decrypted_mnemonic = String::from_utf8(decrypted_bytes).unwrap();
-        assert_eq!(decrypted_mnemonic, TEST_MNEMONIC);
-        assert_eq!(keystore.store.active_accounts.len(), 0);
-
-        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
-
-        let mnemonic = keystore.mnemonic().unwrap();
-        assert_eq!(mnemonic, TEST_MNEMONIC);
-
-        let wrong_password_err = keystore.unlock_by_password("WrongPassword").err().unwrap();
-        assert_eq!(format!("{}", wrong_password_err), "password_incorrect");
-    }
-
-    //    #[test]
-    //    pub fn generate_seed() {
-    //        let mnemonic = Mnemonic::from_phrase(
-    //            "favorite liar zebra assume hurt cage any damp inherit rescue delay panic",
-    //            Language::English,
-    //        )
-    //        .unwrap();
-    //
-    //        //        let entropy = mnemonic.entropy();
-    //
-    //        let seed = bip39::Seed::new(&mnemonic, &"").as_bytes().to_vec();
-    //
-    //        assert_eq!(
-    //            "235c69907d33b85f27bd78e73ff5d0c67bd4894515cc30c77f4391859bc1a3f2",
-    //            hex::encode(seed)
-    //        );
-    //    }
-
-    #[test]
-    pub fn derive_key_at_paths() {
-        let mut keystore =
-            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
-        let coin_info = CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/44'/0'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        };
-        let _ = keystore.unlock_by_password(TEST_PASSWORD).unwrap();
-
-        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
-
-        let expected = Account {
-            address: "mock_address".to_string(),
-            derivation_path: "m/44'/0'/0'/0/0".to_string(),
-            ext_pub_key: "03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77".to_string(),
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-            curve: CurveType::SECP256k1,
-            coin: "BITCOIN".to_string(),
-            public_key: Some("026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868".to_string())
-        };
-
-        assert_eq!(acc, expected);
-        assert_eq!(
-            keystore.account("BITCOIN", "mock_address").unwrap(),
-            &expected
-        );
-        assert_eq!(keystore.store.active_accounts.len(), 1);
-    }
-}
diff --git a/token-core/tcx-chain/src/keystore/mod.rs b/token-core/tcx-chain/src/keystore/mod.rs
deleted file mode 100644
index d055591a..00000000
--- a/token-core/tcx-chain/src/keystore/mod.rs
+++ /dev/null
@@ -1,733 +0,0 @@
-use super::Result;
-use std::time::{SystemTime, UNIX_EPOCH};
-
-mod guard;
-mod hd;
-mod private;
-
-use serde::{Deserialize, Serialize};
-
-use tcx_constants::{CoinInfo, CurveType};
-
-pub use self::{
-    guard::KeystoreGuard, hd::key_hash_from_mnemonic, hd::HdKeystore,
-    private::key_hash_from_private_key, private::PrivateKeystore,
-};
-
-use crate::signer::ChainSigner;
-use tcx_crypto::{Crypto, Pbkdf2Params};
-use tcx_primitive::{TypedDeterministicPublicKey, TypedPrivateKey, TypedPublicKey};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct Store {
-    pub id: String,
-    pub version: i64,
-    pub key_hash: String,
-    pub crypto: Crypto<Pbkdf2Params>,
-    pub active_accounts: Vec<Account>,
-
-    #[serde(rename = "imTokenMeta")]
-    pub meta: Metadata,
-}
-
-#[derive(Fail, Debug, PartialEq)]
-pub enum Error {
-    #[fail(display = "mnemonic_invalid")]
-    MnemonicInvalid,
-    #[fail(display = "mnemonic_word_invalid")]
-    MnemonicWordInvalid,
-    #[fail(display = "mnemonic_length_invalid")]
-    MnemonicLengthInvalid,
-    #[fail(display = "mnemonic_checksum_invalid")]
-    MnemonicChecksumInvalid,
-    #[fail(display = "account_not_found")]
-    AccountNotFound,
-    #[fail(display = "can_not_derive_key")]
-    CannotDeriveKey,
-    #[fail(display = "keystore_locked")]
-    KeystoreLocked,
-    #[fail(display = "invalid_version")]
-    InvalidVersion,
-    #[fail(display = "pkstore_can_not_add_other_curve_account")]
-    PkstoreCannotAddOtherCurveAccount,
-}
-
-fn transform_mnemonic_error(err: failure::Error) -> Error {
-    let err = err.downcast::<bip39::ErrorKind>().unwrap();
-    match err {
-        bip39::ErrorKind::InvalidChecksum => Error::MnemonicChecksumInvalid,
-        bip39::ErrorKind::InvalidWord => Error::MnemonicWordInvalid,
-        bip39::ErrorKind::InvalidWordLength(_) => Error::MnemonicLengthInvalid,
-        _ => Error::MnemonicInvalid,
-    }
-}
-
-/// Account that presents one blockchain wallet on a keystore
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct Account {
-    pub address: String,
-    pub derivation_path: String,
-    pub curve: CurveType,
-    pub coin: String,
-    pub network: String,
-    pub seg_wit: String,
-    pub ext_pub_key: String,
-    pub public_key: Option<String>,
-}
-
-/// Chain address interface, for encapsulate derivation
-pub trait Address {
-    // Incompatible between the trait `Address:PubKey is not implemented for `&<impl curve::PrivateKey as curve::PrivateKey>::PublicKey`
-    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<String>;
-
-    fn is_valid(address: &str, coin: &CoinInfo) -> bool;
-}
-
-/// Source to remember which format it comes from
-///
-/// NOTE: Identity related type is only for imToken App v2.x
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum Source {
-    Wif,
-    Private,
-    Keystore,
-    Mnemonic,
-    NewIdentity,
-    RecoveredIdentity,
-}
-
-/// Metadata of keystore, for presenting wallet data
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Metadata {
-    pub name: String,
-    pub password_hint: String,
-    #[serde(default = "metadata_default_time")]
-    pub timestamp: i64,
-    #[serde(default = "metadata_default_source")]
-    pub source: Source,
-}
-
-fn metadata_default_time() -> i64 {
-    let start = SystemTime::now();
-    let since_the_epoch = start.duration_since(UNIX_EPOCH).expect("get timestamp");
-    since_the_epoch.as_secs() as i64
-}
-
-fn metadata_default_source() -> Source {
-    Source::Mnemonic
-}
-
-impl Default for Metadata {
-    fn default() -> Self {
-        Metadata {
-            name: String::from("Unknown"),
-            password_hint: String::new(),
-            timestamp: metadata_default_time(),
-            source: Source::Mnemonic,
-        }
-    }
-}
-
-pub enum Keystore {
-    PrivateKey(PrivateKeystore),
-    Hd(HdKeystore),
-}
-
-impl Keystore {
-    pub fn from_private_key(private_key: &str, password: &str, meta: Metadata) -> Keystore {
-        Keystore::PrivateKey(PrivateKeystore::from_private_key(
-            private_key,
-            password,
-            meta,
-        ))
-    }
-
-    pub fn from_mnemonic(mnemonic: &str, password: &str, metadata: Metadata) -> Result<Keystore> {
-        Ok(Keystore::Hd(HdKeystore::from_mnemonic(
-            mnemonic, password, metadata,
-        )?))
-    }
-
-    pub fn id(&self) -> String {
-        self.store().id.to_string()
-    }
-
-    pub fn set_id(&mut self, id: &str) {
-        self.store_mut().id = id.to_string()
-    }
-
-    fn store(&self) -> &Store {
-        match self {
-            Keystore::PrivateKey(ks) => ks.store(),
-            Keystore::Hd(ks) => ks.store(),
-        }
-    }
-
-    fn store_mut(&mut self) -> &mut Store {
-        match self {
-            Keystore::PrivateKey(ks) => ks.store_mut(),
-            Keystore::Hd(ks) => ks.store_mut(),
-        }
-    }
-
-    pub fn meta(&self) -> Metadata {
-        self.store().meta.clone()
-    }
-
-    pub fn key_hash(&self) -> String {
-        self.store().key_hash.to_string()
-    }
-
-    pub fn unlock_by_password(&mut self, password: &str) -> Result<()> {
-        match self {
-            Keystore::PrivateKey(ks) => ks.unlock_by_password(password),
-            Keystore::Hd(ks) => ks.unlock_by_password(password),
-        }
-    }
-
-    pub fn unlock_by_derived_key(&mut self, derived_key: &str) -> Result<()> {
-        match self {
-            Keystore::PrivateKey(ks) => ks.unlock_by_derived_key(derived_key),
-            Keystore::Hd(ks) => ks.unlock_by_derived_key(derived_key),
-        }
-    }
-
-    #[cfg(feature = "cache_dk")]
-    pub fn get_derived_key(&self, password: &str) -> Result<String> {
-        self.store()
-            .crypto
-            .generate_derived_key(password)
-            .map(|arr| hex::encode(arr))
-    }
-
-    pub fn is_locked(&self) -> bool {
-        match self {
-            Keystore::PrivateKey(ks) => ks.is_locked(),
-            Keystore::Hd(ks) => ks.is_locked(),
-        }
-    }
-
-    pub fn determinable(&self) -> bool {
-        match self {
-            Keystore::PrivateKey(_) => false,
-            Keystore::Hd(_) => true,
-        }
-    }
-
-    pub fn export(&self) -> Result<String> {
-        match self {
-            Keystore::PrivateKey(pk_store) => pk_store.private_key(),
-            Keystore::Hd(hd_store) => hd_store.mnemonic(),
-        }
-    }
-
-    pub fn export_private_key(
-        &mut self,
-        coin: &str,
-        main_address: &str,
-        path: Option<&str>,
-    ) -> Result<String> {
-        match self {
-            Keystore::PrivateKey(pk_store) => {
-                let _ = pk_store
-                    .account(coin, main_address)
-                    .ok_or(Error::AccountNotFound)?;
-                pk_store.private_key()
-            }
-            Keystore::Hd(hd_store) => {
-                let typed_pk = if let Some(path) = path {
-                    hd_store.find_private_key_by_path(coin, main_address, path)?
-                } else {
-                    hd_store.find_private_key(coin, main_address)?
-                };
-
-                Ok(hex::encode(typed_pk.to_bytes()))
-            }
-        }
-    }
-
-    pub fn lock(&mut self) {
-        match self {
-            Keystore::PrivateKey(ks) => ks.lock(),
-            Keystore::Hd(ks) => ks.lock(),
-        }
-    }
-
-    pub fn derive_coin<A: Address>(&mut self, coin_info: &CoinInfo) -> Result<Account> {
-        match self {
-            Keystore::PrivateKey(ks) => ks.derive_coin::<A>(coin_info),
-            Keystore::Hd(ks) => ks.derive_coin::<A>(coin_info),
-        }
-    }
-
-    pub fn find_private_key(&mut self, symbol: &str, address: &str) -> Result<TypedPrivateKey> {
-        match self {
-            Keystore::PrivateKey(ks) => ks.find_private_key(address),
-            Keystore::Hd(ks) => ks.find_private_key(symbol, address),
-        }
-    }
-
-    pub fn find_private_key_by_path(
-        &mut self,
-        symbol: &str,
-        address: &str,
-        path: &str,
-    ) -> Result<TypedPrivateKey> {
-        match self {
-            Keystore::Hd(ks) => ks.find_private_key_by_path(symbol, address, path),
-            Keystore::PrivateKey(ks) => ks.find_private_key(address),
-        }
-    }
-
-    /*
-    pub fn find_public_key(&mut self, symbol: &str, address:&str) -> Result<TypedPublicKey> {
-        match self {
-            Keystore::Hd(ks) => ks.find_public_key(symbol, address),
-            _ => Err(Error::CannotDeriveKey.into()),
-        }
-    }
-    */
-
-    pub fn find_deterministic_public_key(
-        &mut self,
-        symbol: &str,
-        address: &str,
-    ) -> Result<TypedDeterministicPublicKey> {
-        match self {
-            Keystore::Hd(ks) => ks.find_deterministic_public_key(symbol, address),
-            _ => Err(Error::CannotDeriveKey.into()),
-        }
-    }
-
-    pub fn account(&self, symbol: &str, address: &str) -> Option<&Account> {
-        match self {
-            Keystore::PrivateKey(ks) => ks.account(symbol, address),
-            Keystore::Hd(ks) => ks.account(symbol, address),
-        }
-    }
-
-    pub fn accounts(&self) -> &[Account] {
-        match self {
-            Keystore::PrivateKey(ks) => ks.store().active_accounts.as_slice(),
-            Keystore::Hd(ks) => ks.store().active_accounts.as_slice(),
-        }
-    }
-
-    pub fn verify_password(&self, password: &str) -> bool {
-        match self {
-            Keystore::PrivateKey(ks) => ks.verify_password(password),
-            Keystore::Hd(ks) => ks.verify_password(password),
-        }
-    }
-
-    pub fn from_json(json: &str) -> Result<Keystore> {
-        let store: Store = serde_json::from_str(json)?;
-
-        match store.version {
-            HdKeystore::VERSION => Ok(Keystore::Hd(HdKeystore::from_store(store))),
-            PrivateKeystore::VERSION => {
-                Ok(Keystore::PrivateKey(PrivateKeystore::from_store(store)))
-            }
-
-            _ => Err(Error::InvalidVersion.into()),
-        }
-    }
-
-    pub fn to_json(&self) -> String {
-        match self {
-            Keystore::PrivateKey(ks) => serde_json::to_string(ks.store()).unwrap(),
-            Keystore::Hd(ks) => serde_json::to_string(ks.store()).unwrap(),
-        }
-    }
-}
-
-impl ChainSigner for Keystore {
-    fn sign_recoverable_hash(
-        &mut self,
-        data: &[u8],
-        symbol: &str,
-        address: &str,
-        path: Option<&str>,
-    ) -> Result<Vec<u8>> {
-        let private_key = if path.is_some() {
-            self.find_private_key_by_path(symbol, address, path.unwrap())?
-        } else {
-            self.find_private_key(symbol, address)?
-        };
-        private_key.sign_recoverable(data)
-    }
-
-    fn sign_hash(
-        &mut self,
-        data: &[u8],
-        symbol: &str,
-        address: &str,
-        path: Option<&str>,
-    ) -> Result<Vec<u8>> {
-        let private_key = if path.is_some() {
-            self.find_private_key_by_path(symbol, address, path.unwrap())?
-        } else {
-            self.find_private_key(symbol, address)?
-        };
-
-        private_key.sign(data)
-    }
-
-    fn sign_specified_hash(
-        &mut self,
-        data: &[u8],
-        symbol: &str,
-        address: &str,
-        path: Option<&str>,
-        dst: &str,
-    ) -> Result<Vec<u8>> {
-        let private_key = if path.is_some() {
-            self.find_private_key_by_path(symbol, address, path.unwrap())?
-        } else {
-            self.find_private_key(symbol, address)?
-        };
-
-        private_key.sign_specified_hash(data, dst)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::keystore::Keystore::{Hd, PrivateKey};
-    use crate::{ChainSigner, HdKeystore, Keystore, Metadata, PrivateKeystore, Source};
-    use serde_json::Value;
-    use std::str::FromStr;
-
-    use crate::keystore::metadata_default_source;
-    use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
-    use tcx_primitive::{Ss58Codec, ToHex};
-
-    static HD_KEYSTORE_JSON: &'static str = r#"
-        {
-    "id": "7719d1e3-3f67-439f-a18e-d9ae413e00e1",
-    "version": 11000,
-    "keyHash": "efbe00a55ddd4c5350e295a9533d28f93cac001bfdad8cf4275140461ea03e9e",
-    "crypto": {
-        "cipher": "aes-128-ctr",
-        "cipherparams": {
-            "iv": "6006bd4e828f2f93dca31e36590ca4c9"
-        },
-        "ciphertext": "b06b82b8cda0bc72761177b312dfd46318248ad8473b6c97d46c44aedf6a283f44f0267dd03f210dcddf4ea1a34f85b0b02533dd9c37ce2276cb087af3e43f2a76b968e17c816ca8ea5c",
-        "kdf": "pbkdf2",
-        "kdfparams": {
-            "c": 10240,
-            "prf": "hmac-sha256",
-            "dklen": 32,
-            "salt": "5d85aaf812a613f810cc1cda18d35f46c013f5e537629e25372969f5f87402cd"
-        },
-        "mac": "56af7c5faf0a791cbb4911c4c20070156e4ad0a03f8253b2a2fb005a68d7a026"
-    },
-    "activeAccounts": [
-        {
-            "address": "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-            "derivationPath": "m/44'/145'/0'/0/0",
-            "curve": "SECP256k1",
-            "coin": "BITCOINCASH",
-            "network": "MAINNET",
-            "segWit": "NONE",
-            "extPubKey": "031064f6a580000000251d72997d4cf931a7e6819f7da37725166100fc7dae9ca6afc3f8fd8a3d3a7f0303f2f84851514bf2f40a46b5bb9dbf4e5913fbacde1a96968cda08f9fd882caa",
-            "publicKey": ""
-        }
-    ],
-    "imTokenMeta": {
-        "name": "test-wallet",
-        "passwordHint": "imtoken",
-        "timestamp": 1575605134,
-        "source": "MNEMONIC"
-    }
-}
-"#;
-
-    static PK_KEYSTORE_JSON: &'static str = r#"
-    {"id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b","version":11001,"keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},"activeAccounts":[{"address":"TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG","derivationPath":"","curve":"SECP256k1","coin":"TRON","network":"","segWit":"","extPubKey":"","publicKey":""}],"imTokenMeta":{"name":"Unknown","passwordHint":"","timestamp":1576733295,"source":"PRIVATE"}}
-    "#;
-
-    static OLD_KEYSTORE_JSON: &'static str = r#"
-    {
-  "crypto": {
-    "cipher": "aes-128-ctr",
-    "cipherparams": {
-      "iv": "437ef8c8553df9910ad117ecec5b8c05"
-    },
-    "ciphertext": "acabec2bd6fab27d867ebabe0ded9c64c85aebd294d29ecf537e563474ebb931522dbb977e0644830516550255edde02c507863cb083b55f2f0f759c2f8a885a81a6518237e7b65b7cf3e912fb36e42a13a7b2df3d401e5ff778a412a6d4c5516645770c4b12f2e30551542c699eef",
-    "kdf": "pbkdf2",
-    "kdfparams": {
-      "c": 65535,
-      "dklen": 32,
-      "prf": "hmac-sha256",
-      "salt": "33c8f2d27fe994a1e7d51108c7811cdaa2b821cc6760ed760954b4b67a1bcd8c"
-    },
-    "mac": "6b86a18f4ba9f3f428e256e72a3d832dcf0cd1cb820ec61e413a64d83b012059"
-  },
-  "id": "02a55ab6-554a-4e78-bc26-6a7acced7e5e",
-  "version": 44,
-  "address": "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN",
-  "encMnemonic": {
-    "encStr": "840fad94f4bf4128f629bc1dec731d156283cc4099e3c7659a3bf382031443fcdce6debaaef444393c446d2b4007064c010f6a442b3ad0ff0851c1bd638ba251afa92d3106457bd78c49",
-    "nonce": "4d691a7f0cb6396e96e8dc3e4f35dccd"
-  },
-  "info": {
-    "curve": "spec256k1",
-    "purpuse": "sign"
-  },
-  "mnemonicPath": "m/44'/1'/0'",
-  "xpub": "tpubDCpWeoTY6x4BR2PqoTFJnEdfYbjnC4G8VvKoDUPFjt2dvZJWkMRxLST1pbVW56P7zY3L5jq9MRSeff2xsLnvf9qBBN9AgvrhwfZgw5dJG6R",
-  "imTokenMeta": {
-    "backup": [],
-    "chainType": "BITCOIN",
-    "network": "TESTNET",
-    "name": "BTC",
-    "passwordHint": "",
-    "source": "RECOVERED_IDENTITY",
-    "walletType": "HD",
-    "timestamp": 1519611221,
-    "segWit": "NONE"
-  }
-}
-    "#;
-
-    #[test]
-    fn test_json() {
-        let keystore: Keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
-        assert_eq!(1, keystore.accounts().len());
-        assert_eq!(
-            "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-            keystore.accounts().first().unwrap().address
-        );
-
-        assert_eq!(
-            Value::from_str(&keystore.to_json()).unwrap(),
-            Value::from_str(HD_KEYSTORE_JSON).unwrap()
-        );
-
-        let keystore: Keystore = Keystore::from_json(PK_KEYSTORE_JSON).unwrap();
-        assert_eq!(1, keystore.accounts().len());
-        assert_eq!(
-            "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG",
-            keystore.accounts().first().unwrap().address
-        );
-
-        assert_eq!(
-            Value::from_str(&keystore.to_json()).unwrap(),
-            Value::from_str(PK_KEYSTORE_JSON).unwrap()
-        );
-
-        let ret = Keystore::from_json(OLD_KEYSTORE_JSON);
-        assert!(ret.is_err());
-    }
-
-    #[test]
-    fn test_sign_hash() {
-        let msg = hex::decode("645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76")
-            .unwrap();
-
-        let mut keystore: Keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
-        let ret = keystore.sign_hash(
-            &msg,
-            "BITCOINCASH",
-            "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-            Some("0/2"),
-        );
-        assert!(ret.is_err());
-        assert_eq!(format!("{}", ret.err().unwrap()), "keystore_locked");
-        let _ = keystore.unlock_by_password(TEST_PASSWORD);
-        let ret = keystore
-            .sign_hash(
-                &msg,
-                "BITCOINCASH",
-                "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-                Some("0/2"),
-            )
-            .unwrap();
-        assert_eq!("3045022100a5c14ac7fd46f9f0c951b86d9586595270266ab09b49bf79fc27ebae7866256002206a7d7841fb740ee190c94dcd156228fc820f5ff5ba8c07748b220d07c51d247a", hex::encode(ret));
-
-        let mut keystore: Keystore = Keystore::from_json(PK_KEYSTORE_JSON).unwrap();
-        let ret = keystore.sign_hash(&msg, "TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG", None);
-        assert!(ret.is_err());
-        assert_eq!(format!("{}", ret.err().unwrap()), "keystore_locked");
-        let _ = keystore.unlock_by_password("imtoken1");
-        let msg = hex::decode("645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76")
-            .unwrap();
-        let ret = keystore
-            .sign_hash(&msg, "TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG", None)
-            .unwrap();
-        assert_eq!("30450221008d4920cb3a5a46a3f76845e823c9531f4a882eac4ffd61bfeaa29646999a83d302205c4c5537816911a8b0eb5f0e7ea09839c37e9e22bace8404d23d064c84d403d5", hex::encode(ret));
-    }
-
-    #[test]
-    fn test_keystore_non_sensitive() {
-        let mut keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
-        assert_eq!(keystore.id(), "7719d1e3-3f67-439f-a18e-d9ae413e00e1");
-        keystore.set_id("test_set_id");
-        assert_eq!("test_set_id", keystore.id());
-        assert_eq!("test-wallet", keystore.meta().name);
-        assert!(keystore.determinable());
-        assert_eq!(
-            "efbe00a55ddd4c5350e295a9533d28f93cac001bfdad8cf4275140461ea03e9e",
-            keystore.key_hash()
-        );
-    }
-
-    #[test]
-    fn test_keystore_unlock() {
-        let mut keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
-
-        let export_ret = keystore.export();
-        assert!(export_ret.is_err());
-        assert_eq!(format!("{}", export_ret.err().unwrap()), "keystore_locked");
-        let unlocked_ret = keystore.unlock_by_password("WRONG PASSWORD");
-        assert!(unlocked_ret.is_err());
-        assert_eq!(
-            format!("{}", unlocked_ret.err().unwrap()),
-            "password_incorrect"
-        );
-
-        assert!(keystore.verify_password(TEST_PASSWORD));
-        assert!(!keystore.verify_password("WRONG PASSWORD"));
-        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
-        assert_eq!(
-            "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
-            keystore.export().unwrap()
-        );
-
-        keystore.lock();
-        let export_ret = keystore.export();
-        assert!(export_ret.is_err());
-        assert_eq!(format!("{}", export_ret.err().unwrap()), "keystore_locked");
-    }
-
-    #[test]
-    fn test_hd_find_key() {
-        let mut keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
-        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
-        let pk =
-            keystore.find_private_key("BITCOINCASH", "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y21");
-        assert!(pk.is_err());
-
-        let pk =
-            keystore.find_private_key("BITCOINCASH", "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r");
-        assert_eq!(
-            pk.unwrap()
-                .as_secp256k1()
-                .unwrap()
-                .to_ss58check_with_version(&[0x80]),
-            "L39VXyorp19JfsEJfbD7Tfr4pBEX93RJuVXW7E13C51ZYAhUWbYa"
-        );
-
-        let pk = keystore.find_private_key_by_path(
-            "BITCOINCASH",
-            "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-            "0/0",
-        );
-        assert_eq!(
-            pk.unwrap()
-                .as_secp256k1()
-                .unwrap()
-                .to_ss58check_with_version(&[0x80]),
-            "L39VXyorp19JfsEJfbD7Tfr4pBEX93RJuVXW7E13C51ZYAhUWbYa"
-        );
-
-        let public_key = keystore
-            .find_deterministic_public_key(
-                "BITCOINCASH",
-                "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-            )
-            .unwrap();
-        assert_eq!(public_key.to_hex(), "031064f6a580000000251d72997d4cf931a7e6819f7da37725166100fc7dae9ca6afc3f8fd8a3d3a7f0303f2f84851514bf2f40a46b5bb9dbf4e5913fbacde1a96968cda08f9fd882caa");
-
-        let acc = keystore.account("BITCOINCASH", "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2");
-        assert!(acc.is_none());
-
-        let acc = keystore.account("BITCOINCASH", "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r");
-        assert!(acc.is_some());
-    }
-
-    #[test]
-    fn test_pk_find_key() {
-        let mut keystore = Keystore::from_json(PK_KEYSTORE_JSON).unwrap();
-        keystore.unlock_by_password("imtoken1").unwrap();
-        let pk =
-            keystore.find_private_key("BITCOINCASH", "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y21");
-        assert!(pk.is_err());
-
-        let pk = keystore
-            .find_private_key("TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG")
-            .unwrap();
-        assert_eq!(
-            hex::encode(pk.to_bytes()),
-            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6"
-        );
-
-        let pk = keystore
-            .find_private_key_by_path("TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG", "")
-            .unwrap();
-        assert_eq!(
-            hex::encode(pk.to_bytes()),
-            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6"
-        );
-
-        let acc = keystore.account("TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLsh");
-        assert!(acc.is_none());
-
-        let acc = keystore.account("TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG");
-        assert!(acc.is_some());
-
-        let ret =
-            keystore.find_deterministic_public_key("TRON", "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG");
-        assert!(ret.is_err())
-    }
-
-    #[test]
-    fn test_create() {
-        let hd_store = HdKeystore::new(TEST_PASSWORD, Metadata::default());
-        let keystore = Hd(hd_store);
-        assert_eq!(0, keystore.accounts().len());
-        assert!(keystore.determinable());
-
-        let hd_store =
-            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
-        let keystore = Hd(hd_store);
-        assert_eq!(0, keystore.accounts().len());
-        assert!(keystore.determinable());
-        assert_eq!(
-            keystore.key_hash(),
-            "512115eca3ae86646aeb06861d551e403b543509"
-        );
-
-        let meta = Metadata {
-            name: "test_create".to_string(),
-            password_hint: TEST_PASSWORD.to_string(),
-            source: Source::Private,
-            ..Metadata::default()
-        };
-        let pk_store = PrivateKeystore::from_private_key(
-            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
-            TEST_PASSWORD,
-            meta,
-        );
-        let keystore = PrivateKey(pk_store);
-        assert_eq!(0, keystore.accounts().len());
-        assert!(!keystore.determinable());
-
-        let ret = HdKeystore::from_mnemonic(
-            format!("{} hello", TEST_MNEMONIC).as_str(),
-            TEST_PASSWORD,
-            Metadata::default(),
-        );
-        assert!(ret.is_err())
-    }
-
-    #[test]
-    fn test_default_source() {
-        assert_eq!(Source::Mnemonic, metadata_default_source());
-    }
-}
diff --git a/token-core/tcx-chain/src/keystore/private.rs b/token-core/tcx-chain/src/keystore/private.rs
deleted file mode 100644
index 56cc8ea8..00000000
--- a/token-core/tcx-chain/src/keystore/private.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use super::Account;
-use super::{Address, Metadata};
-use tcx_constants::CoinInfo;
-use tcx_crypto::{Crypto, Key, Pbkdf2Params};
-
-use super::Error;
-use super::Result;
-use crate::keystore::Store;
-
-use tcx_crypto::hash::dsha256;
-use tcx_primitive::TypedPrivateKey;
-use uuid::Uuid;
-
-pub fn key_hash_from_private_key(data: &[u8]) -> String {
-    hex::encode(dsha256(data)[..20].to_vec())
-}
-
-pub struct PrivateKeystore {
-    store: Store,
-
-    private_key: Option<Vec<u8>>,
-}
-
-impl PrivateKeystore {
-    pub const VERSION: i64 = 11001i64;
-
-    pub(crate) fn store(&self) -> &Store {
-        &self.store
-    }
-
-    pub(crate) fn store_mut(&mut self) -> &mut Store {
-        &mut self.store
-    }
-
-    pub(crate) fn from_store(store: Store) -> Self {
-        PrivateKeystore {
-            store,
-            private_key: None,
-        }
-    }
-
-    pub(crate) fn unlock_by_password(&mut self, password: &str) -> Result<()> {
-        self.private_key = Some(self.decrypt_private_key(Key::Password(password.to_owned()))?);
-
-        Ok(())
-    }
-
-    pub(crate) fn unlock_by_derived_key(&mut self, derived_key: &str) -> Result<()> {
-        self.private_key = Some(self.decrypt_private_key(Key::DerivedKey(derived_key.to_owned()))?);
-
-        Ok(())
-    }
-
-    pub(crate) fn lock(&mut self) {
-        self.private_key = None;
-    }
-
-    pub(crate) fn is_locked(&self) -> bool {
-        self.private_key.is_none()
-    }
-
-    pub(crate) fn find_private_key(&self, address: &str) -> Result<TypedPrivateKey> {
-        tcx_ensure!(self.private_key.is_some(), Error::KeystoreLocked);
-
-        let account = self
-            .store
-            .active_accounts
-            .iter()
-            .find(|acc| acc.address == address)
-            .ok_or(Error::AccountNotFound)?;
-
-        let private_key = self.private_key.as_ref().unwrap().as_slice();
-
-        TypedPrivateKey::from_slice(account.curve, private_key)
-    }
-
-    pub(crate) fn derive_coin<A: Address>(&mut self, coin_info: &CoinInfo) -> Result<Account> {
-        tcx_ensure!(self.private_key.is_some(), Error::KeystoreLocked);
-
-        if self.store.active_accounts.len() > 0
-            && self.store.active_accounts[0].curve != coin_info.curve
-        {
-            return Err(Error::PkstoreCannotAddOtherCurveAccount.into());
-        }
-
-        let sk = self.private_key.as_ref().unwrap();
-
-        let account = Self::private_key_to_account::<A>(coin_info, sk)?;
-        if let Some(_) = self
-            .store
-            .active_accounts
-            .iter()
-            .find(|x| x.address == account.address && x.coin == account.coin)
-        {
-            return Ok(account);
-        } else {
-            self.store.active_accounts.push(account.clone());
-            Ok(account)
-        }
-    }
-
-    /// Find an account by coin symbol
-    pub(crate) fn account(&self, symbol: &str, address: &str) -> Option<&Account> {
-        self.store
-            .active_accounts
-            .iter()
-            .find(|acc| acc.coin == symbol && acc.address == address)
-    }
-
-    pub(crate) fn verify_password(&self, password: &str) -> bool {
-        self.store.crypto.verify_password(password)
-    }
-
-    pub fn from_private_key(private_key: &str, password: &str, meta: Metadata) -> PrivateKeystore {
-        let key_data: Vec<u8> = hex::decode(private_key).expect("hex can't decode");
-        let key_hash = key_hash_from_private_key(&key_data);
-        //        let pk_bytes = hex::decode(private_key).expect("valid private_key");
-        let crypto: Crypto<Pbkdf2Params> = Crypto::new(password, &key_data);
-
-        let store = Store {
-            key_hash,
-            crypto,
-            meta,
-            id: Uuid::new_v4().as_hyphenated().to_string(),
-            version: PrivateKeystore::VERSION,
-            active_accounts: vec![],
-        };
-
-        PrivateKeystore {
-            store,
-            private_key: None,
-        }
-    }
-
-    pub(crate) fn private_key_to_account<A: Address>(
-        coin: &CoinInfo,
-        private_key: &[u8],
-    ) -> Result<Account> {
-        let tsk = TypedPrivateKey::from_slice(coin.curve, private_key)?;
-        let pub_key = tsk.public_key();
-        let addr = A::from_public_key(&pub_key, coin)?;
-
-        let acc = Account {
-            address: addr,
-            derivation_path: "".to_string(),
-            curve: coin.curve,
-            coin: coin.coin.to_owned(),
-            network: coin.network.to_string(),
-            seg_wit: coin.seg_wit.to_string(),
-            ext_pub_key: "".to_string(),
-            public_key: Some(hex::encode(pub_key.to_bytes())),
-        };
-
-        Ok(acc)
-    }
-
-    pub(crate) fn private_key(&self) -> Result<String> {
-        tcx_ensure!(self.private_key.is_some(), Error::KeystoreLocked);
-        let vec = self.private_key.as_ref().unwrap().to_vec();
-        Ok(hex::encode(&vec))
-    }
-
-    fn decrypt_private_key(&self, key: Key) -> Result<Vec<u8>> {
-        self.store.crypto.decrypt(key)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{Metadata, PrivateKeystore, Source};
-    use tcx_constants::TEST_PASSWORD;
-
-    #[test]
-    pub fn from_private_key_test() {
-        let meta = Metadata {
-            name: "from_private_key_test".to_string(),
-            source: Source::Private,
-            ..Metadata::default()
-        };
-        let keystore = PrivateKeystore::from_private_key(
-            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
-            TEST_PASSWORD,
-            meta,
-        );
-        assert_eq!(keystore.store.version, 11001);
-        assert_ne!(keystore.store.id, "");
-        assert_eq!(keystore.store.active_accounts.len(), 0);
-    }
-}
diff --git a/token-core/tcx-chain/src/lib.rs b/token-core/tcx-chain/src/lib.rs
deleted file mode 100644
index 0db86fa1..00000000
--- a/token-core/tcx-chain/src/lib.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-//! TokenCore Chain
-//! This is an abstract package to define basic chain data structures.
-#[cfg_attr(tarpaulin, skip)]
-#[macro_use]
-mod macros {
-    #[macro_export]
-    macro_rules! tcx_ensure {
-        ($cond:expr, $e:expr) => {
-            if !($cond) {
-                return Err($e.into());
-            }
-        };
-    }
-}
-
-use core::result;
-
-#[macro_use]
-extern crate failure;
-extern crate regex;
-
-mod keystore;
-mod signer;
-
-pub use keystore::{
-    key_hash_from_mnemonic, key_hash_from_private_key, Account, Address, HdKeystore, Keystore,
-    KeystoreGuard, Metadata, PrivateKeystore, Source,
-};
-
-pub use signer::{ChainSigner, MessageSigner, TransactionSigner};
-
-pub type Result<T> = result::Result<T, failure::Error>;
diff --git a/token-core/tcx-chain/src/signer.rs b/token-core/tcx-chain/src/signer.rs
deleted file mode 100644
index 8e975d72..00000000
--- a/token-core/tcx-chain/src/signer.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use crate::Result;
-
-pub trait TransactionSigner<Input, Output> {
-    fn sign_transaction(&mut self, symbol: &str, address: &str, tx: &Input) -> Result<Output>;
-}
-
-//pub trait Message: Sized {}
-//pub trait SignedMessage: Sized {}
-pub trait MessageSigner<Input, Output> {
-    fn sign_message(&mut self, symbol: &str, address: &str, message: &Input) -> Result<Output>;
-}
-
-pub trait ChainSigner {
-    fn sign_recoverable_hash(
-        &mut self,
-        data: &[u8],
-        symbol: &str,
-        address: &str,
-        path: Option<&str>,
-    ) -> Result<Vec<u8>>;
-
-    fn sign_hash(
-        &mut self,
-        data: &[u8],
-        symbol: &str,
-        address: &str,
-        path: Option<&str>,
-    ) -> Result<Vec<u8>>;
-
-    fn sign_specified_hash(
-        &mut self,
-        data: &[u8],
-        symbol: &str,
-        address: &str,
-        path: Option<&str>,
-        dst: &str,
-    ) -> Result<Vec<u8>>;
-}
diff --git a/token-core/tcx-ckb/Cargo.toml b/token-core/tcx-ckb/Cargo.toml
index a7e46edd..b3149a66 100644
--- a/token-core/tcx-ckb/Cargo.toml
+++ b/token-core/tcx-ckb/Cargo.toml
@@ -2,23 +2,25 @@
 name = "tcx-ckb"
 version = "0.1.0"
 authors = ["tyrone <2125081@qq.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 tcx-crypto = { path = "../tcx-crypto" }
-tcx-chain = { path = "../tcx-chain" }
+tcx-keystore = { path = "../tcx-keystore" }
 tcx-primitive = { path = "../tcx-primitive" }
 tcx-constants = { path = "../tcx-constants" }
+tcx-common = { path = "../tcx-common"}
 
-prost = "0.11.2"
-bytes = "1.3.0"
-blake2b-rs = "0.2.0"
-failure = "0.1.8"
-byteorder = "1.4.3"
-bech32 = "0.9.1"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+blake2b-rs = "=0.2.0"
+anyhow = { version = "=1.0.79", features = [] }
+byteorder = "=1.4.3"
+bech32 = "=0.9.1"
 
-hex = "0.4.3"
-lazy_static = "1.4.0"
+hex = "=0.4.3"
+lazy_static = "=1.4.0"
+thiserror = "=1.0.56"
 
diff --git a/token-core/tcx-ckb/src/address.rs b/token-core/tcx-ckb/src/address.rs
index 51a55e0c..df3e017d 100644
--- a/token-core/tcx-ckb/src/address.rs
+++ b/token-core/tcx-ckb/src/address.rs
@@ -1,7 +1,8 @@
 use crate::hash::blake2b_160;
 use bech32::{FromBase32, ToBase32, Variant};
-use tcx_chain::{Address, Result};
+use std::str::FromStr;
 use tcx_constants::CoinInfo;
+use tcx_keystore::{Address, Result};
 use tcx_primitive::TypedPublicKey;
 
 // TYPE should be u5
@@ -9,10 +10,11 @@ static TYPE_FULL_DATA: u8 = 2u8;
 static TYPE_FULL_TYPE: u8 = 4u8;
 static TYPE_SHORT: u8 = 1u8;
 
-pub struct CkbAddress();
+#[derive(PartialEq, Eq, Clone)]
+pub struct CkbAddress(String);
 
 impl Address for CkbAddress {
-    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<String> {
+    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<Self> {
         let prefix = match coin.network.as_str() {
             "TESTNET" => "ckt",
             _ => "ckb",
@@ -24,13 +26,17 @@ impl Address for CkbAddress {
         buf.extend(vec![0x1, 0x00]); // append short version for locks with popular codehash and default code hash index
         buf.extend(pub_key_hash);
 
-        Ok(bech32::encode(prefix, buf.to_base32(), Variant::Bech32)?)
+        Ok(CkbAddress(bech32::encode(
+            prefix,
+            buf.to_base32(),
+            Variant::Bech32,
+        )?))
     }
 
     fn is_valid(address: &str, coin: &CoinInfo) -> bool {
         let ret = bech32::decode(address);
-        if ret.is_ok() {
-            let (hrp, data, _) = ret.unwrap();
+        if let Ok(val) = ret {
+            let (hrp, data, _) = val;
             let data = Vec::from_base32(&data).unwrap();
             let address_type = data[0];
 
@@ -51,23 +57,39 @@ impl Address for CkbAddress {
                 }
             }
             match hrp.as_str() {
-                "ckb" => return coin.network == "MAINNET",
-                "ckt" => return coin.network == "TESTNET",
+                "ckb" => coin.network == "MAINNET",
+                "ckt" => coin.network == "TESTNET",
                 _ => false,
             }
         } else {
-            return false;
+            false
         }
     }
 }
 
+impl FromStr for CkbAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(CkbAddress(s.to_string()))
+    }
+}
+
+impl ToString for CkbAddress {
+    fn to_string(&self) -> String {
+        self.0.clone()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::address::CkbAddress;
-    use tcx_chain::Address;
+    use std::str::FromStr;
+    use tcx_common::FromHex;
+    use tcx_keystore::Address;
 
     use tcx_constants::{CoinInfo, CurveType};
-    use tcx_primitive::TypedPublicKey;
+    use tcx_primitive::{TypedPrivateKey, TypedPublicKey};
 
     #[test]
     fn pubkey_to_address() {
@@ -86,12 +108,14 @@ mod tests {
 
             let pub_key = TypedPublicKey::from_slice(
                 CurveType::SECP256k1,
-                &hex::decode("024a501efd328e062c8675f2365970728c859c592beeefd6be8ead3d901330bc01")
-                    .unwrap(),
+                &Vec::from_hex(
+                    "024a501efd328e062c8675f2365970728c859c592beeefd6be8ead3d901330bc01",
+                )
+                .unwrap(),
             )
             .unwrap();
             let addr = CkbAddress::from_public_key(&pub_key, &coin_info).unwrap();
-            assert_eq!(addr, address);
+            assert_eq!(addr.to_string(), address);
         }
     }
 
@@ -133,6 +157,8 @@ mod tests {
         let invalid_address = vec![
             "ckt1qyzndsefa43s6m882pcj53m4gdnj4k440axqcth0hp",
             "ckt1qyqrdsefa43s6m882pcj53m4gdnj4k440axqqm65l9j",
+            "ckt1qcqrdsefa43s6m882pcj53m4gdnj4k440axqyj7g8k",
+            "test1qyqrdsefa43s6m882pcj53m4gdnj4k440axqpkzhhy",
         ];
         for invalid_address in invalid_address {
             let coin_info = CoinInfo {
@@ -145,4 +171,31 @@ mod tests {
             assert!(!CkbAddress::is_valid(invalid_address, &coin_info));
         }
     }
+
+    #[test]
+    fn test_address_from_str() {
+        let expect_address = "ckb1qyqdmeuqrsrnm7e5vnrmruzmsp4m9wacf6vsxasryq";
+        let ckb_address = CkbAddress::from_str(expect_address).unwrap();
+        assert_eq!(ckb_address.to_string(), expect_address);
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let prv_str = "8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let address = CkbAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6");
+    }
 }
diff --git a/token-core/tcx-ckb/src/hash.rs b/token-core/tcx-ckb/src/hash.rs
index d98a8b62..be6697b3 100644
--- a/token-core/tcx-ckb/src/hash.rs
+++ b/token-core/tcx-ckb/src/hash.rs
@@ -35,3 +35,31 @@ fn inner_blake2b_256<T: AsRef<[u8]>>(s: T) -> [u8; 32] {
     blake2b.finalize(&mut result);
     result
 }
+
+#[cfg(test)]
+mod test {
+    use crate::hash::{blake2b_160, blake2b_256};
+    #[test]
+    fn test_blake2b_256_param_is_empty() {
+        let hash = blake2b_256(vec![]);
+        assert_eq!(
+            hash,
+            [
+                68, 244, 198, 151, 68, 213, 248, 197, 93, 100, 32, 98, 148, 157, 202, 228, 155,
+                196, 231, 239, 67, 211, 136, 197, 161, 47, 66, 181, 99, 61, 22, 62
+            ]
+        );
+    }
+
+    #[test]
+    fn test_blake2b_160_param_is_empty() {
+        let hash = blake2b_160(vec![]);
+        assert_eq!(
+            hash,
+            [
+                68, 244, 198, 151, 68, 213, 248, 197, 93, 100, 32, 98, 148, 157, 202, 228, 155,
+                196, 231, 239
+            ]
+        );
+    }
+}
diff --git a/token-core/tcx-ckb/src/lib.rs b/token-core/tcx-ckb/src/lib.rs
index 3da6ce6e..4c862e06 100644
--- a/token-core/tcx-ckb/src/lib.rs
+++ b/token-core/tcx-ckb/src/lib.rs
@@ -5,69 +5,50 @@ mod signer;
 mod transaction;
 mod transaction_helper;
 
-use failure::Fail;
-
 pub use address::CkbAddress;
 pub use serializer::Serializer;
-use tcx_chain::Result;
+use thiserror::Error;
 pub use transaction::{CachedCell, CellInput, CkbTxInput, CkbTxOutput, OutPoint, Script, Witness};
 
-#[derive(Fail, Debug, PartialEq)]
+#[derive(Error, Debug, PartialEq)]
 pub enum Error {
-    #[fail(display = "invalid_output_point")]
+    #[error("invalid_output_point")]
     InvalidOutputPoint,
 
-    #[fail(display = "invalid_outputs_data_length")]
+    #[error("invalid_outputs_data_length")]
     InvalidOutputsDataLength,
 
-    #[fail(display = "required_witness")]
+    #[error("required_witness")]
     RequiredWitness,
 
-    #[fail(display = "invalid_input_cells")]
+    #[error("invalid_input_cells")]
     InvalidInputCells,
 
-    #[fail(display = "required_output_data")]
+    #[error("required_output_data")]
     RequiredOutputsData,
 
-    #[fail(display = "witness_group_empty")]
+    #[error("witness_group_empty")]
     WitnessGroupEmpty,
 
-    #[fail(display = "witness_empty")]
+    #[error("witness_empty")]
     WitnessEmpty,
 
-    #[fail(display = "invalid_tx_hash")]
+    #[error("invalid_tx_hash")]
     InvalidTxHash,
 
-    #[fail(display = "invalid_hash_type")]
+    #[error("invalid_hash_type")]
     InvalidHashType,
 
-    #[fail(display = "cell_input_not_cached")]
+    #[error("cell_input_not_cached")]
     CellInputNotCached,
 
-    #[fail(display = "invalid_hex_value")]
+    #[error("invalid_hex_value")]
     InvalidHexValue,
 }
+pub mod nervos {
+    pub const CHAINS: [&str; 1] = ["NERVOS"];
 
-pub fn hex_to_bytes(value: &str) -> Result<Vec<u8>> {
-    let result = if value.starts_with("0x") || value.starts_with("0X") {
-        hex::decode(&value[2..])
-    } else {
-        hex::decode(&value[..])
-    };
-
-    result.map_err(|_| Error::InvalidHexValue.into())
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::hex_to_bytes;
-
-    #[test]
-    pub fn hex_convert() {
-        let v: Vec<u8> = vec![];
-        assert_eq!(v, hex_to_bytes("0x").unwrap());
-        assert_eq!(vec![0x01], hex_to_bytes("0x01").unwrap());
-        assert_eq!(vec![0x02], hex_to_bytes("0x02").unwrap());
-        assert_eq!(vec![0x02, 0x11], hex_to_bytes("0x0211").unwrap());
-    }
+    pub type Address = crate::address::CkbAddress;
+    pub type TransactionInput = crate::transaction::CkbTxInput;
+    pub type TransactionOutput = crate::transaction::CkbTxOutput;
 }
diff --git a/token-core/tcx-ckb/src/serializer.rs b/token-core/tcx-ckb/src/serializer.rs
index 161436e9..47b0e757 100644
--- a/token-core/tcx-ckb/src/serializer.rs
+++ b/token-core/tcx-ckb/src/serializer.rs
@@ -16,9 +16,9 @@ impl Serializer {
         let mut offsets = vec![];
         let mut total = header_length;
 
-        for i in 0..element_lengths.len() {
-            offsets.push(total as u32);
-            total = total + (element_lengths[i] as u32);
+        for (i, _) in element_lengths.iter().enumerate() {
+            offsets.push(total);
+            total += element_lengths[i];
         }
 
         (total, offsets)
@@ -84,10 +84,10 @@ impl Serializer {
         let mut ret: Vec<u8> = vec![];
         let mut body: Vec<u8> = vec![];
 
-        let mut total_size = 0 as u32;
+        let mut total_size = 0_u32;
 
         for item in values.iter() {
-            total_size = total_size + item.len() as u32;
+            total_size += item.len() as u32;
 
             body.extend(*item);
         }
@@ -102,6 +102,7 @@ impl Serializer {
 #[cfg(test)]
 mod tests {
     use crate::serializer::Serializer;
+    use tcx_common::{FromHex, ToHex};
 
     #[test]
     fn serialize_struct() {
@@ -109,34 +110,34 @@ mod tests {
             vec![0x11u8, 0x13u8].as_slice(),
             vec![0x20u8, 0x17u8, 0x9u8].as_slice(),
         ]);
-        assert_eq!(hex::encode(bytes), "1113201709");
+        assert_eq!(bytes.to_hex(), "1113201709");
     }
 
     #[test]
     fn serialize_fixed_vec() {
-        let bytes = Serializer::serialize_fixed_vec(&vec![hex::decode("1234567890abcdef")
+        let bytes = Serializer::serialize_fixed_vec(&vec![Vec::from_hex("1234567890abcdef")
             .unwrap()
             .as_slice()]);
-        assert_eq!(hex::encode(bytes), "080000001234567890abcdef");
+        assert_eq!(bytes.to_hex(), "080000001234567890abcdef");
     }
 
     #[test]
     fn serialize_dynamic_vec() {
         let bytes = Serializer::serialize_dynamic_vec(&vec![]);
-        assert_eq!(hex::encode(bytes), "04000000");
+        assert_eq!(bytes.to_hex(), "04000000");
 
-        let bytes = Serializer::serialize_dynamic_vec(&vec![hex::decode("020000001234")
+        let bytes = Serializer::serialize_dynamic_vec(&vec![Vec::from_hex("020000001234")
             .unwrap()
             .as_slice()]);
-        assert_eq!(hex::encode(bytes), "0e00000008000000020000001234");
+        assert_eq!(bytes.to_hex(), "0e00000008000000020000001234");
 
         let bytes = Serializer::serialize_dynamic_vec(&vec![
-            hex::decode("020000001234").unwrap().as_slice(),
-            hex::decode("00000000").unwrap().as_slice(),
-            hex::decode("020000000567").unwrap().as_slice(),
-            hex::decode("0100000089").unwrap().as_slice(),
-            hex::decode("03000000abcdef").unwrap().as_slice(),
+            Vec::from_hex("020000001234").unwrap().as_slice(),
+            Vec::from_hex("00000000").unwrap().as_slice(),
+            Vec::from_hex("020000000567").unwrap().as_slice(),
+            Vec::from_hex("0100000089").unwrap().as_slice(),
+            Vec::from_hex("03000000abcdef").unwrap().as_slice(),
         ]);
-        assert_eq!(hex::encode(bytes), "34000000180000001e00000022000000280000002d00000002000000123400000000020000000567010000008903000000abcdef");
+        assert_eq!(bytes.to_hex(), "34000000180000001e00000022000000280000002d00000002000000123400000000020000000567010000008903000000abcdef");
     }
 }
diff --git a/token-core/tcx-ckb/src/signer.rs b/token-core/tcx-ckb/src/signer.rs
index aea47bc4..56fe7844 100644
--- a/token-core/tcx-ckb/src/signer.rs
+++ b/token-core/tcx-ckb/src/signer.rs
@@ -1,18 +1,16 @@
-use tcx_chain::{Keystore, Result, TransactionSigner};
+use tcx_keystore::{Keystore, Result, SignatureParameters, Signer, TransactionSigner};
 
 use crate::hash::new_blake2b;
 use crate::serializer::Serializer;
 use crate::transaction::{CachedCell, CkbTxInput, CkbTxOutput, OutPoint, Witness};
-use crate::{hex_to_bytes, Error};
-use std::collections::HashMap;
-use tcx_chain::ChainSigner;
-
+use crate::Error;
 use lazy_static::lazy_static;
+use std::collections::HashMap;
+use tcx_common::{FromHex, ToHex};
 
 pub struct CkbTxSigner<'a> {
-    ks: &'a mut dyn ChainSigner,
-    symbol: &'a str,
-    address: &'a str,
+    ks: &'a mut Keystore,
+    sign_context: &'a SignatureParameters,
 }
 
 lazy_static! {
@@ -31,7 +29,7 @@ impl<'a> CkbTxSigner<'a> {
             return Err(Error::InvalidTxHash.into());
         }
 
-        if witnesses.len() == 0 {
+        if witnesses.is_empty() {
             return Err(Error::WitnessEmpty.into());
         }
 
@@ -39,7 +37,7 @@ impl<'a> CkbTxSigner<'a> {
 
         let mut raw_witnesses: Vec<String> = vec![];
         for w in witnesses.iter() {
-            raw_witnesses.push(format!("0x{}", hex::encode(w.to_raw()?)));
+            raw_witnesses.push(w.to_raw()?.to_0x_hex());
         }
 
         for item in grouped_scripts.iter() {
@@ -53,7 +51,7 @@ impl<'a> CkbTxSigner<'a> {
             let path = &input_cells[item.1[0]].derived_path;
 
             let signed_witness = self.sign_witness_group(tx_hash, &ws, path)?;
-            raw_witnesses[item.1[0]] = format!("0x{}", hex::encode(signed_witness.serialize()?));
+            raw_witnesses[item.1[0]] = signed_witness.serialize()?.to_0x_hex();
         }
 
         Ok(raw_witnesses)
@@ -65,7 +63,7 @@ impl<'a> CkbTxSigner<'a> {
         witness_group: &[&Witness],
         path: &str,
     ) -> Result<Witness> {
-        if witness_group.len() == 0 {
+        if witness_group.is_empty() {
             return Err(Error::WitnessGroupEmpty.into());
         }
 
@@ -94,17 +92,18 @@ impl<'a> CkbTxSigner<'a> {
         let mut result = [0u8; 32];
         s.finalize(&mut result);
 
-        let opt_path = if path.len() > 0 { Some(path) } else { None };
+        let derivation_path = if !path.is_empty() {
+            path
+        } else {
+            &self.sign_context.derivation_path
+        };
 
-        empty_witness.lock = format!(
-            "0x{}",
-            hex::encode(self.ks.sign_recoverable_hash(
-                &result,
-                self.symbol,
-                self.address,
-                opt_path
-            )?)
-        );
+        if !path.is_empty() {
+            empty_witness.lock = self
+                .ks
+                .secp256k1_ecdsa_sign_recoverable(&result, derivation_path)?
+                .to_0x_hex();
+        }
 
         Ok(empty_witness)
     }
@@ -115,7 +114,7 @@ impl<'a> CkbTxSigner<'a> {
     ) -> Result<HashMap<Vec<u8>, Vec<usize>>> {
         let mut map: HashMap<Vec<u8>, Vec<usize>> = HashMap::new();
 
-        for i in 0..input_cells.len() {
+        for (i, _) in input_cells.iter().enumerate() {
             let item = &input_cells[i];
             if item.lock.is_none() {
                 continue;
@@ -123,8 +122,8 @@ impl<'a> CkbTxSigner<'a> {
 
             let hash = item.lock.as_ref().unwrap().to_hash()?;
             let indices = map.get_mut(&hash);
-            if indices.is_some() {
-                indices.unwrap().push(i);
+            if let Some(val) = indices {
+                val.push(i);
             } else {
                 map.insert(hash, vec![i]);
             }
@@ -137,11 +136,10 @@ impl<'a> CkbTxSigner<'a> {
 impl TransactionSigner<CkbTxInput, CkbTxOutput> for Keystore {
     fn sign_transaction(
         &mut self,
-        symbol: &str,
-        address: &str,
+        params: &SignatureParameters,
         tx: &CkbTxInput,
     ) -> Result<CkbTxOutput> {
-        if tx.witnesses.len() == 0 {
+        if tx.witnesses.is_empty() {
             return Err(Error::RequiredWitness.into());
         }
 
@@ -168,18 +166,20 @@ impl TransactionSigner<CkbTxInput, CkbTxOutput> for Keystore {
             input_cells.push(find_cache_cell(x.previous_output.as_ref().unwrap())?);
         }
 
-        if tx.witnesses.len() < input_cells.len() || input_cells.len() == 0 {
+        if tx.witnesses.len() < input_cells.len() || input_cells.is_empty() {
             return Err(Error::InvalidInputCells.into());
         }
 
         let mut signer = CkbTxSigner {
             ks: self,
-            symbol,
-            address,
+            sign_context: params,
         };
 
-        let signed_witnesses =
-            signer.sign_witnesses(&hex_to_bytes(&tx.tx_hash)?, &tx.witnesses, &input_cells)?;
+        let signed_witnesses = signer.sign_witnesses(
+            &Vec::from_hex_auto(&tx.tx_hash)?,
+            &tx.witnesses,
+            &input_cells,
+        )?;
 
         let tx_output = CkbTxOutput {
             tx_hash: tx.tx_hash.clone(),
@@ -193,9 +193,12 @@ impl TransactionSigner<CkbTxInput, CkbTxOutput> for Keystore {
 #[cfg(test)]
 mod tests {
     use crate::address::CkbAddress;
+    use crate::signer::CkbTxSigner;
     use crate::transaction::{CachedCell, CellInput, CkbTxInput, OutPoint, Script, Witness};
-    use tcx_chain::{Keystore, Metadata, TransactionSigner};
-    use tcx_constants::{CoinInfo, CurveType};
+    use crate::Error;
+    use tcx_common::FromHex;
+    use tcx_constants::{CoinInfo, CurveType, TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_keystore::{Keystore, Metadata, SignatureParameters, TransactionSigner};
 
     #[test]
     fn test_sign_transaction() {
@@ -219,6 +222,7 @@ mod tests {
                         .to_owned(),
                     hash_type: "type".to_string(),
                 }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
                 ..CachedCell::default()
             },
             CachedCell {
@@ -236,6 +240,7 @@ mod tests {
                         .to_owned(),
                     hash_type: "type".to_string(),
                 }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
                 ..CachedCell::default()
             },
             CachedCell {
@@ -253,6 +258,7 @@ mod tests {
                         .to_owned(),
                     hash_type: "type".to_string(),
                 }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
                 ..CachedCell::default()
             },
         ];
@@ -300,14 +306,10 @@ mod tests {
             seg_wit: "".to_string(),
         };
 
-        let mut ks = Keystore::from_mnemonic(
-            "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
-            "Password",
-            Metadata::default(),
-        )
-        .unwrap();
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
 
-        ks.unlock_by_password("Password").unwrap();
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
 
         let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
 
@@ -315,10 +317,14 @@ mod tests {
             account.address,
             "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
         );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
 
-        let tx_output = ks
-            .sign_transaction("NERVOS", &account.address, &tx_input)
-            .unwrap();
+        let tx_output = ks.sign_transaction(&params, &tx_input).unwrap();
         assert_eq!(tx_output.witnesses[0], "0x55000000100000005500000055000000410000009b87828a6274850b4c8724a286b882aae3ace127c124e4f6687070c09e2533c80b33ace45005a4912f4d092e31f017a8dc9f2f97ef66fb5e2b5e9314ade9b60e00");
     }
 
@@ -349,6 +355,7 @@ mod tests {
                         .to_owned(),
                     hash_type: "type".to_string(),
                 }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
                 ..CachedCell::default()
             },
             CachedCell {
@@ -366,6 +373,7 @@ mod tests {
                         .to_owned(),
                     hash_type: "type".to_owned(),
                 }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
                 ..CachedCell::default()
             },
             CachedCell {
@@ -383,6 +391,7 @@ mod tests {
                         .to_owned(),
                     hash_type: "type".to_owned(),
                 }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
                 ..CachedCell::default()
             },
         ];
@@ -416,10 +425,13 @@ mod tests {
 
         let mut ks = Keystore::from_private_key(
             "dcec27d0d975b0378471183a03f7071dea8532aaf968be796719ecd20af6988f",
-            "Password",
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
             Metadata::default(),
-        );
-        ks.unlock_by_password("Password").unwrap();
+            None,
+        )
+        .unwrap();
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
 
         let coin_info = CoinInfo {
             coin: "NERVOS".to_string(),
@@ -429,7 +441,7 @@ mod tests {
             seg_wit: "".to_string(),
         };
 
-        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+        let _account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
 
         let invalid_input = vec![
             (
@@ -473,11 +485,426 @@ mod tests {
                 "cell_input_not_cached",
             ),
         ];
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
         for (input, err) in invalid_input {
-            let ret = ks.sign_transaction("NERVOS", &account.address, &input);
+            let ret = ks.sign_transaction(&params, &input);
 
             assert!(ret.is_err());
             assert_eq!(format!("{}", ret.err().unwrap()), err);
         }
     }
+
+    #[test]
+    fn test_empty_witnesses() {
+        let tx_hash = "0x719933ec055272734ab709a80492edb44c083e6b675e5c37e5bb3f720fe88e5e";
+
+        let witnesses = vec![];
+        let cached_cells = vec![];
+        let inputs = vec![];
+
+        let tx_input = CkbTxInput {
+            inputs,
+            witnesses,
+            tx_hash: tx_hash.clone().to_owned(),
+            cached_cells,
+            ..CkbTxInput::default()
+        };
+
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+
+        assert_eq!(
+            account.address,
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
+        );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
+
+        let actual = ks.sign_transaction(&params, &tx_input);
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::RequiredWitness.to_string()
+        );
+    }
+
+    #[test]
+    fn test_invalid_input_cells() {
+        let tx_hash = "0x719933ec055272734ab709a80492edb44c083e6b675e5c37e5bb3f720fe88e5e";
+
+        let witnesses = vec![Witness::default(), Witness::default(), Witness::default()];
+        let cached_cells = vec![CachedCell {
+            out_point: Some({
+                OutPoint {
+                    tx_hash: "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                        .to_owned(),
+                    index: 0,
+                }
+            }),
+            lock: Some(Script {
+                args: "0xb1e8f5e7b4be7867ca6cd556ee3954a325979f45".to_owned(),
+                code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+                    .to_owned(),
+                hash_type: "type".to_string(),
+            }),
+            derived_path: "m/44'/309'/0'/0/0".to_string(),
+            ..CachedCell::default()
+        }];
+        let inputs = vec![];
+
+        let tx_input = CkbTxInput {
+            inputs,
+            witnesses,
+            tx_hash: tx_hash.clone().to_owned(),
+            cached_cells,
+            ..CkbTxInput::default()
+        };
+
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+
+        assert_eq!(
+            account.address,
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
+        );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
+
+        let actual = ks.sign_transaction(&params, &tx_input);
+
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::InvalidInputCells.to_string()
+        );
+    }
+
+    #[test]
+    fn test_invalid_output_point() {
+        let tx_hash = "0x719933ec055272734ab709a80492edb44c083e6b675e5c37e5bb3f720fe88e5e";
+
+        let witnesses = vec![Witness::default(), Witness::default(), Witness::default()];
+        let cached_cells = vec![CachedCell {
+            out_point: Some({
+                OutPoint {
+                    tx_hash: "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                        .to_owned(),
+                    index: 0,
+                }
+            }),
+            lock: Some(Script {
+                args: "0xb1e8f5e7b4be7867ca6cd556ee3954a325979f45".to_owned(),
+                code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+                    .to_owned(),
+                hash_type: "type".to_string(),
+            }),
+            derived_path: "m/44'/309'/0'/0/0".to_string(),
+            ..CachedCell::default()
+        }];
+        let inputs = vec![CellInput {
+            previous_output: None,
+            since: "".to_owned(),
+        }];
+
+        let tx_input = CkbTxInput {
+            inputs,
+            witnesses,
+            tx_hash: tx_hash.clone().to_owned(),
+            cached_cells,
+            ..CkbTxInput::default()
+        };
+
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+
+        assert_eq!(
+            account.address,
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
+        );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
+
+        let actual = ks.sign_transaction(&params, &tx_input);
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::InvalidOutputPoint.to_string()
+        );
+    }
+
+    #[test]
+    fn test_empty_witness_group() {
+        let tx_hash = "0x719933ec055272734ab709a80492edb44c083e6b675e5c37e5bb3f720fe88e5e";
+
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+
+        assert_eq!(
+            account.address,
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
+        );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
+
+        let mut signer = CkbTxSigner {
+            ks: &mut ks,
+            sign_context: &params,
+        };
+
+        let actual = signer.sign_witness_group(
+            &Vec::from_hex_auto(tx_hash).unwrap(),
+            &vec![],
+            params.derivation_path.as_str(),
+        );
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::WitnessGroupEmpty.to_string()
+        );
+    }
+
+    #[test]
+    fn test_signer_witness_empty() {
+        let tx_hash = "0x719933ec055272734ab709a80492edb44c083e6b675e5c37e5bb3f720fe88e5e";
+
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+
+        assert_eq!(
+            account.address,
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
+        );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
+
+        let mut signer = CkbTxSigner {
+            ks: &mut ks,
+            sign_context: &params,
+        };
+        let witnesses: Vec<Witness> = vec![];
+        let cached_cells: Vec<&CachedCell> = vec![];
+        let result = signer.sign_witnesses(
+            Vec::from_0x_hex(tx_hash).unwrap().as_slice(),
+            witnesses.as_slice(),
+            cached_cells.as_slice(),
+        );
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            Error::WitnessEmpty.to_string()
+        );
+    }
+
+    #[test]
+    fn test_sign_transaction2() {
+        let tx_hash = "0x719933ec055272734ab709a80492edb44c083e6b675e5c37e5bb3f720fe88e5e";
+
+        let witnesses = vec![
+            Witness::default(),
+            Witness::default(),
+            Witness::default(),
+            Witness::default(),
+        ];
+
+        let cached_cells = vec![
+            CachedCell {
+                out_point: Some({
+                    OutPoint {
+                        tx_hash:
+                            "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                                .to_owned(),
+                        index: 0,
+                    }
+                }),
+                lock: Some(Script {
+                    args: "0xb1e8f5e7b4be7867ca6cd556ee3954a325979f45".to_owned(),
+                    code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+                        .to_owned(),
+                    hash_type: "type".to_string(),
+                }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
+                ..CachedCell::default()
+            },
+            CachedCell {
+                out_point: Some({
+                    OutPoint {
+                        tx_hash:
+                            "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                                .to_owned(),
+                        index: 1,
+                    }
+                }),
+                lock: Some(Script {
+                    args: "0xb1e8f5e7b4be7867ca6cd556ee3954a325979f45".to_owned(),
+                    code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+                        .to_owned(),
+                    hash_type: "type".to_string(),
+                }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
+                ..CachedCell::default()
+            },
+            CachedCell {
+                out_point: Some({
+                    OutPoint {
+                        tx_hash:
+                            "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                                .to_owned(),
+                        index: 2,
+                    }
+                }),
+                lock: Some(Script {
+                    args: "0xb1e8f5e7b4be7867ca6cd556ee3954a325979f45".to_owned(),
+                    code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+                        .to_owned(),
+                    hash_type: "type".to_string(),
+                }),
+                derived_path: "m/44'/309'/0'/0/0".to_string(),
+                ..CachedCell::default()
+            },
+        ];
+
+        let inputs = vec![
+            CellInput {
+                previous_output: Some(OutPoint {
+                    tx_hash: "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                        .to_owned(),
+                    index: 0,
+                }),
+                since: "".to_owned(),
+            },
+            CellInput {
+                previous_output: Some(OutPoint {
+                    tx_hash: "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                        .to_owned(),
+                    index: 1,
+                }),
+                since: "".to_string(),
+            },
+            CellInput {
+                previous_output: Some(OutPoint {
+                    tx_hash: "0x67b35360a09ecbdaf7cef55bb9b58b194d1e067007c67d67520ee730fcd1f252"
+                        .to_owned(),
+                    index: 2,
+                }),
+                since: "".to_string(),
+            },
+        ];
+
+        let tx_input = CkbTxInput {
+            inputs,
+            witnesses,
+            tx_hash: tx_hash.clone().to_owned(),
+            cached_cells,
+            ..CkbTxInput::default()
+        };
+
+        let coin_info = CoinInfo {
+            coin: "NERVOS".to_string(),
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        ks.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let account = ks.derive_coin::<CkbAddress>(&coin_info).unwrap().clone();
+
+        assert_eq!(
+            account.address,
+            "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6"
+        );
+        let params = SignatureParameters {
+            derivation_path: "m/44'/309'/0'/0/0".to_string(),
+            chain_type: "NERVOS".to_string(),
+            network: "TESTNET".to_string(),
+            ..Default::default()
+        };
+
+        let tx_output = ks.sign_transaction(&params, &tx_input).unwrap();
+        assert_eq!(tx_output.witnesses[0], "0x5500000010000000550000005500000041000000074e13dbb2482c1fb93ba75b670be2b1a8e66d8e944b5c800215ac535950a2ac6f2bebc12ef03ea2d7dc67ec79ee4c0295a0e30d747cb8c85ad45cdc6a6e676700");
+    }
 }
diff --git a/token-core/tcx-ckb/src/transaction_helper.rs b/token-core/tcx-ckb/src/transaction_helper.rs
index afbbe7b5..e26d29dd 100644
--- a/token-core/tcx-ckb/src/transaction_helper.rs
+++ b/token-core/tcx-ckb/src/transaction_helper.rs
@@ -3,8 +3,8 @@ use crate::transaction::{Script, Witness};
 
 use super::Error;
 use crate::hash::blake2b_256;
-use crate::hex_to_bytes;
-use tcx_chain::Result;
+use tcx_common::FromHex;
+use tcx_keystore::Result;
 
 impl Script {
     pub fn serialize_hash_type(&self) -> Result<Vec<u8>> {
@@ -16,31 +16,31 @@ impl Script {
     }
 
     pub fn serialize(&self) -> Result<Vec<u8>> {
-        let args_bytes = hex_to_bytes(&self.args)?;
-        Ok(Serializer::serialize_dynamic_vec(&vec![
-            hex_to_bytes(&self.code_hash)?.as_slice(),
+        let args_bytes = Vec::from_hex_auto(&self.args)?;
+        Ok(Serializer::serialize_dynamic_vec(&[
+            Vec::from_hex_auto(&self.code_hash)?.as_slice(),
             self.serialize_hash_type()?.as_slice(),
             Serializer::serialize_fixed_vec(vec![args_bytes.as_slice()].as_slice()).as_slice(),
         ]))
     }
 
     pub fn to_hash(&self) -> Result<Vec<u8>> {
-        Ok(blake2b_256(&self.serialize()?))
+        Ok(blake2b_256(self.serialize()?))
     }
 }
 
 impl Witness {
     pub fn serialize(&self) -> Result<Vec<u8>> {
         let inner_serialize = |x: &str| -> Result<Vec<u8>> {
-            let bytes = hex_to_bytes(&x)?;
-            if bytes.len() > 0 {
-                Ok(Serializer::serialize_fixed_vec(&vec![bytes.as_slice()]))
+            let bytes = Vec::from_hex_auto(x)?;
+            if !bytes.is_empty() {
+                Ok(Serializer::serialize_fixed_vec(&[bytes.as_slice()]))
             } else {
                 Ok(vec![])
             }
         };
 
-        Ok(Serializer::serialize_dynamic_vec(&vec![
+        Ok(Serializer::serialize_dynamic_vec(&[
             inner_serialize(&self.lock)?.as_slice(),
             inner_serialize(&self.input_type)?.as_slice(),
             inner_serialize(&self.output_type)?.as_slice(),
@@ -67,6 +67,8 @@ impl Witness {
 #[cfg(test)]
 mod tests {
     use crate::transaction::{Script, Witness};
+    use crate::Error;
+    use tcx_common::{FromHex, ToHex};
 
     #[test]
     fn serialize_script() {
@@ -77,7 +79,7 @@ mod tests {
             hash_type: "type".to_string(),
         };
 
-        assert_eq!(script.serialize().unwrap(), hex::decode("4900000010000000300000003100000068d5438ac952d2f584abf879527946a537e82c7f3c1cbf6d8ebf9767437d8e8801140000003954acece65096bfa81258983ddb83915fc56bd8").unwrap());
+        assert_eq!(script.serialize().unwrap(), Vec::from_hex("4900000010000000300000003100000068d5438ac952d2f584abf879527946a537e82c7f3c1cbf6d8ebf9767437d8e8801140000003954acece65096bfa81258983ddb83915fc56bd8").unwrap());
 
         let script = Script {
             code_hash: "0x68d5438ac952d2f584abf879527946a537e82c7f3c1cbf6d8ebf9767437d8e88"
@@ -86,7 +88,23 @@ mod tests {
             hash_type: "type".to_string(),
         };
 
-        assert_eq!(script.serialize().unwrap(), hex::decode("3500000010000000300000003100000068d5438ac952d2f584abf879527946a537e82c7f3c1cbf6d8ebf9767437d8e880100000000").unwrap());
+        assert_eq!(script.serialize().unwrap(), Vec::from_hex("3500000010000000300000003100000068d5438ac952d2f584abf879527946a537e82c7f3c1cbf6d8ebf9767437d8e880100000000").unwrap());
+    }
+
+    #[test]
+    fn test_invalid_hash_type() {
+        let script = Script {
+            code_hash: "0x68d5438ac952d2f584abf879527946a537e82c7f3c1cbf6d8ebf9767437d8e88"
+                .to_owned(),
+            args: "0x3954acece65096bfa81258983ddb83915fc56bd8".to_owned(),
+            hash_type: "test".to_string(),
+        };
+        let actual = script.serialize();
+
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::InvalidHashType.to_string()
+        );
     }
 
     #[test]
@@ -99,7 +117,7 @@ mod tests {
         };
 
         assert_eq!(
-            hex::encode(script.to_hash().unwrap()),
+            script.to_hash().unwrap().to_hex(),
             "77c93b0632b5b6c3ef922c5b7cea208fb0a7c427a13d50e13d3fefad17e0c590"
         );
 
@@ -110,7 +128,7 @@ mod tests {
             hash_type: "data".to_string(),
         };
         assert_eq!(
-            hex::encode(script.to_hash().unwrap()),
+            script.to_hash().unwrap().to_hex(),
             "67951b34bce20cb71b7e235c1f8cda259628d99d94825bffe549c23b4dd2930f"
         );
 
@@ -122,7 +140,7 @@ mod tests {
         };
 
         assert_eq!(
-            hex::encode(script.to_hash().unwrap()),
+            script.to_hash().unwrap().to_hex(),
             "d39f84d4702f53cf8625da4411be1640b961715cb36816501798fedb70b6e0fb",
         );
     }
@@ -136,7 +154,7 @@ mod tests {
         };
 
         assert_eq!(
-            hex::encode(witness.serialize().unwrap()),
+            witness.serialize().unwrap().to_hex(),
             "10000000100000001000000010000000"
         );
 
@@ -146,7 +164,7 @@ mod tests {
             output_type: "0x20".to_owned(),
         };
         assert_eq!(
-            hex::encode(witness.serialize().unwrap()),
+            witness.serialize().unwrap().to_hex(),
             "1a00000010000000100000001500000001000000100100000020"
         );
     }
@@ -158,7 +176,16 @@ mod tests {
             input_type: "0x".to_owned(),
             output_type: "0x".to_owned(),
         };
+        assert_eq!("", witness.to_raw().unwrap().to_hex());
 
-        assert_eq!("", hex::encode(witness.to_raw().unwrap()));
+        let witness = Witness {
+            lock: "0x".to_owned(),
+            input_type: "0x10".to_owned(),
+            output_type: "0x20".to_owned(),
+        };
+        assert_eq!(
+            "1a00000010000000100000001500000001000000100100000020",
+            witness.to_raw().unwrap().to_hex()
+        );
     }
 }
diff --git a/token-core/tcx-common/Cargo.toml b/token-core/tcx-common/Cargo.toml
new file mode 100644
index 00000000..6c134b51
--- /dev/null
+++ b/token-core/tcx-common/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "tcx-common"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = { version = "=1.0.79", features = [] }
+hex = "=0.4.3"
+regex = "=1.9.3"
+keccak-hash = "=0.10.0"
+ctr = "=0.9.2"
+aes = "=0.8.3"
+secp256k1 = "=0.24.3"
+bitcoin = "=0.29.2"
+tiny-bip39 = "=1.0.0"
+rand = "=0.8.5"
+ethereum-types = "0.14.0"
+thiserror = "=1.0.56"
diff --git a/token-core/tcx-common/src/errors.rs b/token-core/tcx-common/src/errors.rs
new file mode 100644
index 00000000..9909c41a
--- /dev/null
+++ b/token-core/tcx-common/src/errors.rs
@@ -0,0 +1,9 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum CommonError {
+    #[error("invalid_address")]
+    InvalidAddress,
+    #[error("invalid_address_checksum")]
+    InvalidAddressChecksum,
+}
diff --git a/token-core/tcx-common/src/hash.rs b/token-core/tcx-common/src/hash.rs
new file mode 100644
index 00000000..23891eaa
--- /dev/null
+++ b/token-core/tcx-common/src/hash.rs
@@ -0,0 +1,229 @@
+use bitcoin::hashes::{ripemd160, sha256, sha256d, Hash};
+
+pub type Hash256 = [u8; 32];
+pub type Hash160 = [u8; 20];
+
+pub fn merkle_hash(data: &[u8]) -> Hash256 {
+    assert!(!data.is_empty(), "data should not be empty");
+
+    let mut hashes = data.chunks(1024).map(sha256d).collect::<Vec<Hash256>>();
+
+    let mut len = hashes.len();
+    let mut data = [0u8; 64];
+
+    //loop until we have a single hash
+    while len > 1 {
+        //hash pairs of items
+        let mut i = 0;
+        while i < len {
+            data[..32].clone_from_slice(&hashes[i]);
+            data[32..].clone_from_slice(
+                &hashes[{
+                    if i + 1 < len {
+                        i + 1
+                    } else {
+                        i
+                    }
+                }],
+            );
+
+            hashes[i / 2] = sha256d(&data);
+            i += 2;
+        }
+
+        len = (len + 1) / 2;
+    }
+
+    hashes[0]
+}
+
+#[inline]
+pub fn sha256(data: &[u8]) -> Hash256 {
+    sha256::Hash::hash(data).into_inner()
+}
+
+#[inline]
+pub fn sha256d(data: &[u8]) -> Hash256 {
+    sha256d::Hash::hash(data).into_inner()
+}
+
+#[inline]
+pub fn keccak256(data: &[u8]) -> Hash256 {
+    keccak_hash::keccak(data).to_fixed_bytes()
+}
+
+#[inline]
+pub fn ripemd160(bytes: &[u8]) -> Hash160 {
+    ripemd160::Hash::hash(bytes).into_inner()
+}
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::ToHex;
+
+    #[test]
+    fn test_ripemd160() {
+        let tests = vec![
+            ("", "9c1185a5c5e9fc54612808977ee8f548b2258d31"),
+            ("a", "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe"),
+            ("abc", "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc"),
+            ("message digest", "5d0689ef49d2fae572b881b123a85ffa21595f36"),
+            (
+                "abcdefghijklmnopqrstuvwxyz",
+                "f71c27109c692c1b56bbdceb5b9d2865b3708dbc",
+            ),
+            (
+                "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+                "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
+            ),
+            (
+                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+                "b0e20b6e3116640286ed3a87a5713079b21f5189",
+            ),
+            (
+                "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+                "9b752e45573d4b39f4dbd3323cab82bf63326bfb",
+            ),
+        ];
+
+        for t in tests {
+            assert_eq!(ripemd160(t.0.as_bytes()).to_hex(), t.1);
+        }
+    }
+
+    #[test]
+    fn test_sha256d() {
+        //generate sha256d unit tests
+        let tests = vec![
+            (
+                "\0",
+                "1406e05881e299367766d313e26c05564ec91bf721d31726bd6e46e60689539a",
+            ),
+            (
+                "",
+                "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456",
+            ),
+            (
+                "abc",
+                "4f8b42c22dd3729b519ba6f68d2da7cc5b2d606d05daed5ad5128cc03e6c6358",
+            ),
+            (
+                "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+                "0cffe17f68954dac3a84fb1458bd5ec99209449749b2b308b7cb55812f9563af",
+            ),
+            (
+                "The quick brown fox jumps over the lazy dog",
+                "6d37795021e544d82b41850edf7aabab9a0ebe274e54a519840c4666f35b3937",
+            ),
+        ];
+
+        for t in tests {
+            assert_eq!(sha256d(t.0.as_bytes()).to_hex(), t.1);
+        }
+    }
+
+    #[test]
+    fn test_keccak256() {
+        //generate keccak256 unit tests
+        let tests = vec![
+            (
+                "\0",
+                "bc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a",
+            ),
+            (
+                "",
+                "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+            ),
+            (
+                "abc",
+                "4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45",
+            ),
+            (
+                "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+                "45d3b367a6904e6e8d502ee04999a7c27647f91fa845d456525fd352ae3d7371",
+            ),
+            (
+                "The quick brown fox jumps over the lazy dog",
+                "4d741b6f1eb29cb2a9b9911c82f56fa8d73b04959d3d9d222895df6c0b28aa15",
+            ),
+        ];
+
+        for t in tests {
+            assert_eq!(keccak256(t.0.as_bytes()).to_hex(), t.1);
+        }
+    }
+
+    #[test]
+    fn test_sha256() {
+        let tests = vec![
+            (
+                "\0",
+                "6e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d",
+            ),
+            (
+                "",
+                "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+            ),
+            (
+                "abc",
+                "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+            ),
+            (
+                "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+                "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
+            ),
+            (
+                "The quick brown fox jumps over the lazy dog",
+                "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592",
+            ),
+        ];
+
+        for t in tests {
+            assert_eq!(sha256(t.0.as_bytes()).to_hex(), t.1);
+        }
+    }
+
+    #[test]
+    fn test_merkle_hash() {
+        let tests = vec![
+            (
+                1000,
+                "3fa2b684fa9d80f04b70187e6c9ff1c8dd422ce1846beb79cf5e1546c7062d41",
+            ),
+            (
+                2000,
+                "4b19aa611413ba9a6b89a2be7833bb835349b9e9e9872c5eacfc82daa2e5f08f",
+            ),
+            (
+                3000,
+                "c9ec2ec071ed70d02802decd912a1e8d124420556789384efaab80fcb7ce7ecb",
+            ),
+            (
+                4000,
+                "5cfa6745c50787e3d97a1322789713036f8cab7ba534d2a996bea015d811640c",
+            ),
+            (
+                5000,
+                "233bc40f24c071507474a9c978f0f0099d0c457f9874326640be55a8a8b96325",
+            ),
+            (
+                1024,
+                "5a6c9dcbec66882a3de754eb13e61d8908e6c0b67a23c9d524224ecd93746290",
+            ),
+            (
+                2048,
+                "5ee830087937da00520c4ce3793c5c7b951d37771d69a098415ddf7d682a39d9",
+            ),
+        ];
+
+        for t in tests {
+            let mut data = vec![0u8; t.0];
+
+            for i in 0..t.0 {
+                data[i] = (i / 1024 % 0xff) as u8;
+            }
+
+            assert_eq!(merkle_hash(&data).to_hex(), t.1);
+        }
+    }
+}
diff --git a/token-core/tcx-common/src/hex.rs b/token-core/tcx-common/src/hex.rs
new file mode 100644
index 00000000..f8ac1a77
--- /dev/null
+++ b/token-core/tcx-common/src/hex.rs
@@ -0,0 +1,124 @@
+use super::Result;
+use anyhow::anyhow;
+
+pub trait ToHex {
+    fn to_hex(&self) -> String;
+
+    fn to_0x_hex(&self) -> String {
+        format!("0x{}", self.to_hex())
+    }
+}
+
+pub trait FromHex
+where
+    Self: Sized,
+{
+    fn from_hex<T: AsRef<[u8]>>(value: T) -> Result<Self>;
+
+    fn from_0x_hex<T: AsRef<[u8]>>(value: T) -> Result<Self> {
+        if value.as_ref().len() == 0 {
+            return Ok(Self::from_hex("")?);
+        }
+
+        let bytes = value.as_ref();
+        Self::from_hex(&bytes[2..bytes.len()])
+    }
+
+    fn from_hex_auto<T: AsRef<[u8]>>(value: T) -> Result<Self> {
+        let bytes = value.as_ref();
+        if bytes.len() >= 2 && bytes[0] == b'0' && (bytes[1] == b'x' || bytes[1] == b'X') {
+            Self::from_0x_hex(value)
+        } else {
+            Self::from_hex(value)
+        }
+    }
+}
+
+impl<T: AsRef<[u8]>> ToHex for T {
+    fn to_hex(&self) -> String {
+        hex::encode(self)
+    }
+}
+
+impl ToHex for [u8] {
+    fn to_hex(&self) -> String {
+        hex::encode(self)
+    }
+}
+
+impl FromHex for Vec<u8> {
+    fn from_hex<T: AsRef<[u8]>>(value: T) -> Result<Self> {
+        hex::decode(value).map_err(|e| anyhow!("{}", e.to_string()))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{FromHex, ToHex};
+    #[test]
+    fn test_to_hex() {
+        let data = vec![0x01, 0x02, 0x03, 0x04];
+        assert_eq!(data.to_hex(), "01020304");
+    }
+
+    #[test]
+    fn test_to_hex_empty() {
+        let data = vec![];
+        assert_eq!(data.to_hex(), "");
+    }
+
+    #[test]
+    fn test_to_hex_with_prefix_empty() {
+        let data = vec![];
+        assert_eq!(data.to_0x_hex(), "0x");
+    }
+
+    #[test]
+    fn test_to_hex_from_slice() {
+        let data = vec![0x01, 0x02, 0x03, 0x04];
+        assert_eq!(data[0..2].to_hex(), "0102");
+    }
+
+    #[test]
+    fn test_to_hex_from_fixed_array() {
+        let data = [0x01, 0x02, 0x03, 0x04];
+        assert_eq!(data.to_hex(), "01020304");
+    }
+
+    #[test]
+    fn test_to_hex_with_prefix() {
+        let data = vec![0x01, 0x02, 0x03, 0x04];
+        assert_eq!(data.to_0x_hex(), "0x01020304");
+    }
+
+    #[test]
+    fn test_from_hex() {
+        let data = vec![0x01, 0x02, 0x03, 0x04];
+        assert_eq!(Vec::from_hex("01020304").unwrap(), data);
+    }
+
+    #[test]
+    fn test_from_hex_with_prefix() {
+        let value = "0x01020304";
+        assert_eq!(Vec::from_0x_hex(value).unwrap(), [0x01, 0x02, 0x03, 0x04]);
+    }
+
+    #[test]
+    fn test_from_hex_with_prefix_error() {
+        let value = "0x010203041";
+        assert!(Vec::from_0x_hex(value).is_err(),);
+    }
+
+    #[test]
+    fn test_from_hex_auto() {
+        assert_eq!(
+            Vec::from_hex_auto("0x01020304").unwrap(),
+            [0x01, 0x02, 0x03, 0x04]
+        );
+
+        assert_eq!(
+            Vec::from_hex_auto("01020304").unwrap(),
+            [0x01, 0x02, 0x03, 0x04]
+        );
+    }
+}
diff --git a/token-core/tcx-common/src/lib.rs b/token-core/tcx-common/src/lib.rs
new file mode 100644
index 00000000..a1f29305
--- /dev/null
+++ b/token-core/tcx-common/src/lib.rs
@@ -0,0 +1,21 @@
+mod hash;
+mod rand;
+
+mod errors;
+pub mod hex;
+mod time;
+
+mod uint;
+mod util;
+
+pub use crate::errors::*;
+pub use crate::hash::*;
+pub use crate::hex::{FromHex, ToHex};
+pub use crate::rand::*;
+pub use crate::time::*;
+pub use crate::uint::*;
+pub use crate::util::*;
+
+use std::result;
+
+pub type Result<T> = result::Result<T, anyhow::Error>;
diff --git a/token-core/tcx-common/src/rand.rs b/token-core/tcx-common/src/rand.rs
new file mode 100644
index 00000000..d6c00a02
--- /dev/null
+++ b/token-core/tcx-common/src/rand.rs
@@ -0,0 +1,49 @@
+use rand::Rng;
+
+#[inline]
+pub fn random_bytes<const N: usize>() -> [u8; N] {
+    let mut bytes = [0u8; N];
+    rand::thread_rng().fill(&mut bytes[..]);
+    bytes
+}
+
+#[inline]
+pub fn random_u8_16() -> [u8; 16] {
+    random_bytes::<16>()
+}
+
+#[inline]
+pub fn random_u8_32() -> [u8; 32] {
+    random_bytes::<32>()
+}
+
+#[inline]
+pub fn random_u8_64() -> [u8; 64] {
+    random_bytes::<64>()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_random_u8_16() {
+        let r1 = random_u8_16();
+        let r2 = random_u8_16();
+        assert_ne!(r1, r2);
+    }
+
+    #[test]
+    fn test_random_u8_32() {
+        let r1 = random_u8_32();
+        let r2 = random_u8_32();
+        assert_ne!(r1, r2);
+    }
+
+    #[test]
+    fn test_random_u8_64() {
+        let r1 = random_u8_64();
+        let r2 = random_u8_64();
+        assert_ne!(r1, r2);
+    }
+}
diff --git a/token-core/tcx-common/src/time.rs b/token-core/tcx-common/src/time.rs
new file mode 100644
index 00000000..aaf1e1ec
--- /dev/null
+++ b/token-core/tcx-common/src/time.rs
@@ -0,0 +1,19 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+#[inline]
+pub fn unix_timestamp() -> u64 {
+    let start = SystemTime::now();
+    let since_the_epoch = start
+        .duration_since(UNIX_EPOCH)
+        .expect("Time went backwards");
+    since_the_epoch.as_secs() * 1000
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_unix_timestamp() {
+        let timestamp = super::unix_timestamp();
+        assert!(timestamp > 0);
+    }
+}
diff --git a/token-core/tcx-common/src/uint.rs b/token-core/tcx-common/src/uint.rs
new file mode 100644
index 00000000..512a6039
--- /dev/null
+++ b/token-core/tcx-common/src/uint.rs
@@ -0,0 +1,36 @@
+use crate::Result;
+use ethereum_types::{U256, U64};
+
+pub fn parse_u64(number: &str) -> Result<U64> {
+    if number.to_lowercase().starts_with("0x") {
+        Ok(U64::from_str_radix(&number[2..], 16)?)
+    } else {
+        Ok(U64::from_dec_str(number)?)
+    }
+}
+
+pub fn parse_u256(number: &str) -> Result<U256> {
+    if number.to_lowercase().starts_with("0x") {
+        Ok(U256::from_str_radix(&number[2..], 16)?)
+    } else {
+        Ok(U256::from_dec_str(number)?)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ethereum_types::{U256, U64};
+    #[test]
+    fn test_parse_u64() {
+        assert_eq!(super::parse_u64("0xff").unwrap(), U64::from(255u64));
+        assert_eq!(super::parse_u64("1234567").unwrap(), U64::from(1234567));
+        assert_eq!(super::parse_u64("").unwrap(), U64::from(0));
+        assert!(super::parse_u64("/").is_err());
+    }
+
+    #[test]
+    fn test_parse_u256() {
+        assert_eq!(super::parse_u256("0xff").unwrap(), U256::from(255u64));
+        assert_eq!(super::parse_u256("1234567").unwrap(), U256::from(1234567));
+    }
+}
diff --git a/token-core/tcx-common/src/util.rs b/token-core/tcx-common/src/util.rs
new file mode 100644
index 00000000..ddc9fb75
--- /dev/null
+++ b/token-core/tcx-common/src/util.rs
@@ -0,0 +1,35 @@
+use crate::FromHex;
+use crate::Result;
+
+pub fn utf8_or_hex_to_bytes(value: &str) -> Result<Vec<u8>> {
+    if value.to_lowercase().starts_with("0x") {
+        let ret = FromHex::from_0x_hex(value);
+        if ret.is_err() {
+            Ok(value.as_bytes().to_vec())
+        } else {
+            ret
+        }
+    } else {
+        Ok(value.as_bytes().to_vec())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_utf8_or_hex_to_bytes() {
+        let tests = vec![
+            ("0x1234", vec![0x12, 0x34]),
+            ("1234", vec![0x31, 0x32, 0x33, 0x34]),
+            ("0x1234abcd", vec![0x12, 0x34, 0xab, 0xcd]),
+            (
+                "1234abcd",
+                vec![0x31, 0x32, 0x33, 0x34, 0x61, 0x62, 0x63, 0x64],
+            ),
+        ];
+
+        for t in tests {
+            assert_eq!(super::utf8_or_hex_to_bytes(t.0).unwrap(), t.1);
+        }
+    }
+}
diff --git a/token-core/tcx-constants/Cargo.toml b/token-core/tcx-constants/Cargo.toml
index 996a6687..fb05447e 100644
--- a/token-core/tcx-constants/Cargo.toml
+++ b/token-core/tcx-constants/Cargo.toml
@@ -2,13 +2,14 @@
 name = "tcx-constants"
 version = "0.1.0"
 authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-failure = "0.1.8"
-lazy_static = "1.4.0"
-serde_json = "1.0.88"
-serde = { version = "1.0.147", features = ["derive"] }
-parking_lot = "0.12.1"
\ No newline at end of file
+tcx-common = { path = "../tcx-common" }
+anyhow = { version = "=1.0.79", features = [] }
+lazy_static = "=1.4.0"
+serde_json = "=1.0.89"
+serde = { version = "=1.0.147", features = ["derive"] }
+parking_lot = "=0.12.1"
diff --git a/token-core/tcx-constants/src/btc_fork_network.rs b/token-core/tcx-constants/src/btc_fork_network.rs
index 116d6b33..9cbddd1c 100644
--- a/token-core/tcx-constants/src/btc_fork_network.rs
+++ b/token-core/tcx-constants/src/btc_fork_network.rs
@@ -21,155 +21,157 @@ pub struct HdVersion {
 
 lazy_static! {
     static ref BTC_FORK_NETWORKS: RwLock<Vec<BtcForkNetwork>> = {
-        let mut networks = Vec::new();
-        networks.push(BtcForkNetwork {
-            coin: "LITECOIN",
-            network: "MAINNET",
-            seg_wit: "NONE",
-            hrp: "",
-            p2pkh_prefix: 0x30,
-            p2sh_prefix: 0x32,
-            private_prefix: 0xb0,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "LITECOIN",
-            network: "MAINNET",
-            seg_wit: "P2WPKH",
-            hrp: "",
-            p2pkh_prefix: 0x30,
-            p2sh_prefix: 0x32,
-            private_prefix: 0xb0,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "LITECOIN",
-            network: "MAINNET",
-            seg_wit: "SEGWIT",
-            hrp: "ltc",
-            p2pkh_prefix: 0x30,
-            p2sh_prefix: 0x32,
-            private_prefix: 0xb0,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "LITECOIN",
-            network: "TESTNET",
-            seg_wit: "NONE",
-            hrp: "",
-            p2pkh_prefix: 0x6f,
-            p2sh_prefix: 0x3a,
-            private_prefix: 0xef,
-            //            043587CF
-            //            04358394
-            xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
-            xprv_prefix: [0x04, 0x35, 0x83, 0x94],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "LITECOIN",
-            network: "TESTNET",
-            seg_wit: "P2WPKH",
-            hrp: "",
-            p2pkh_prefix: 0x6f,
-            p2sh_prefix: 0x3a,
-            private_prefix: 0xef,
-            xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
-            xprv_prefix: [0x04, 0x35, 0x83, 0x94],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "BITCOIN",
-            network: "MAINNET",
-            seg_wit: "NONE",
-            hrp: "",
-            p2pkh_prefix: 0x0,
-            p2sh_prefix: 0x05,
-            private_prefix: 0x80,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "BITCOIN",
-            network: "MAINNET",
-            seg_wit: "P2WPKH",
-            hrp: "",
-            p2pkh_prefix: 0x0,
-            p2sh_prefix: 0x05,
-            private_prefix: 0x80,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "BITCOIN",
-            network: "MAINNET",
-            seg_wit: "SEGWIT",
-            hrp: "bc",
-            p2pkh_prefix: 0x0,
-            p2sh_prefix: 0x05,
-            private_prefix: 0x80,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "BITCOIN",
-            network: "TESTNET",
-            seg_wit: "NONE",
-            hrp: "",
-            p2pkh_prefix: 0x6f,
-            p2sh_prefix: 0xc4,
-            private_prefix: 0xef,
-            xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
-            xprv_prefix: [0x04, 0x35, 0x83, 0x94],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "BITCOIN",
-            network: "TESTNET",
-            seg_wit: "P2WPKH",
-            hrp: "",
-            p2pkh_prefix: 0x6f,
-            p2sh_prefix: 0xc4,
-            private_prefix: 0xef,
-            xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
-            xprv_prefix: [0x04, 0x35, 0x83, 0x94],
-        });
-        //Definition of BitcoinCash networks https://github.com/bitpay/bitcore/blob/master/packages/bitcore-lib-cash/lib/networks.js#L168
-        networks.push(BtcForkNetwork {
-            coin: "BITCOINCASH",
-            network: "MAINNET",
-            seg_wit: "NONE",
-            hrp: "bitcoincash",
-            p2pkh_prefix: 0x0,
-            p2sh_prefix: 0x05,
-            private_prefix: 0x80,
-            xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
-            xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        networks.push(BtcForkNetwork {
-            coin: "BITCOINCASH",
-            network: "TESTNET",
-            seg_wit: "NONE",
-            hrp: "bitcoincash",
-            p2pkh_prefix: 0x6f,
-            p2sh_prefix: 0xc4,
-            private_prefix: 0xef,
-            xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
-            xprv_prefix: [0x04, 0x35, 0x83, 0x94],
-        });
+        let networks = vec![
+            BtcForkNetwork {
+                coin: "LITECOIN",
+                network: "MAINNET",
+                seg_wit: "NONE",
+                hrp: "",
+                p2pkh_prefix: 0x30,
+                p2sh_prefix: 0x32,
+                private_prefix: 0xb0,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "LITECOIN",
+                network: "MAINNET",
+                seg_wit: "P2WPKH",
+                hrp: "",
+                p2pkh_prefix: 0x30,
+                p2sh_prefix: 0x32,
+                private_prefix: 0xb0,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "LITECOIN",
+                network: "MAINNET",
+                seg_wit: "VERSION_0",
+                hrp: "ltc",
+                p2pkh_prefix: 0x30,
+                p2sh_prefix: 0x32,
+                private_prefix: 0xb0,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "LITECOIN",
+                network: "TESTNET",
+                seg_wit: "NONE",
+                hrp: "",
+                p2pkh_prefix: 0x6f,
+                p2sh_prefix: 0x3a,
+                private_prefix: 0xef,
+                //            043587CF
+                //            04358394
+                xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
+                xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+            },
+            BtcForkNetwork {
+                coin: "LITECOIN",
+                network: "TESTNET",
+                seg_wit: "P2WPKH",
+                hrp: "",
+                p2pkh_prefix: 0x6f,
+                p2sh_prefix: 0x3a,
+                private_prefix: 0xef,
+                xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
+                xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+            },
+            BtcForkNetwork {
+                coin: "BITCOIN",
+                network: "MAINNET",
+                seg_wit: "NONE",
+                hrp: "",
+                p2pkh_prefix: 0x0,
+                p2sh_prefix: 0x05,
+                private_prefix: 0x80,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "BITCOIN",
+                network: "MAINNET",
+                seg_wit: "P2WPKH",
+                hrp: "",
+                p2pkh_prefix: 0x0,
+                p2sh_prefix: 0x05,
+                private_prefix: 0x80,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "BITCOIN",
+                network: "MAINNET",
+                seg_wit: "VERSION_0",
+                hrp: "bc",
+                p2pkh_prefix: 0x0,
+                p2sh_prefix: 0x05,
+                private_prefix: 0x80,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "BITCOIN",
+                network: "TESTNET",
+                seg_wit: "NONE",
+                hrp: "",
+                p2pkh_prefix: 0x6f,
+                p2sh_prefix: 0xc4,
+                private_prefix: 0xef,
+                xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
+                xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+            },
+            BtcForkNetwork {
+                coin: "BITCOIN",
+                network: "TESTNET",
+                seg_wit: "P2WPKH",
+                hrp: "",
+                p2pkh_prefix: 0x6f,
+                p2sh_prefix: 0xc4,
+                private_prefix: 0xef,
+                xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
+                xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+            },
+            //Definition of BitcoinCash networks https://github.com/bitpay/bitcore/blob/master/packages/bitcore-lib-cash/lib/networks.js#L168
+            BtcForkNetwork {
+                coin: "BITCOINCASH",
+                network: "MAINNET",
+                seg_wit: "NONE",
+                hrp: "bitcoincash",
+                p2pkh_prefix: 0x0,
+                p2sh_prefix: 0x05,
+                private_prefix: 0x80,
+                xpub_prefix: [0x04, 0x88, 0xB2, 0x1E],
+                xprv_prefix: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            BtcForkNetwork {
+                coin: "BITCOINCASH",
+                network: "TESTNET",
+                seg_wit: "NONE",
+                hrp: "bitcoincash",
+                p2pkh_prefix: 0x6f,
+                p2sh_prefix: 0xc4,
+                private_prefix: 0xef,
+                xpub_prefix: [0x04, 0x35, 0x87, 0xCF],
+                xprv_prefix: [0x04, 0x35, 0x83, 0x94],
+            },
+        ];
         RwLock::new(networks)
     };
 
     static ref HD_VERSIONS: RwLock<Vec<HdVersion>> = {
-        let mut versions = Vec::new();
-        versions.push(HdVersion {
-            pub_version: [0x04, 0x88, 0xB2, 0x1E],
-            prv_version: [0x04, 0x88, 0xAD, 0xE4],
-        });
-        versions.push(HdVersion {
-            pub_version: [0x04, 0x35, 0x87, 0xCF],
-            prv_version: [0x04, 0x35, 0x83, 0x94],
-        });
+        let versions = vec![
+            HdVersion {
+                pub_version: [0x04, 0x88, 0xB2, 0x1E],
+                prv_version: [0x04, 0x88, 0xAD, 0xE4],
+            },
+            HdVersion {
+                pub_version: [0x04, 0x35, 0x87, 0xCF],
+                prv_version: [0x04, 0x35, 0x83, 0x94],
+            },
+        ];
         RwLock::new(versions)
     };
 }
@@ -194,7 +196,7 @@ pub fn network_from_param(
         .filter(|x| x.coin.eq(&chain_type.to_uppercase()))
         .filter(|x| x.network.eq(&network.to_uppercase()))
         .filter(|x| x.seg_wit.eq(&seg_wit.to_uppercase()))
-        .map(|x| x.clone())
+        .cloned()
         .collect::<Vec<BtcForkNetwork>>();
     ret.pop()
 }
@@ -204,7 +206,7 @@ pub fn network_form_hrp(hrp: &str) -> Option<BtcForkNetwork> {
     let mut ret: Vec<BtcForkNetwork> = networks
         .iter()
         .filter(|x| x.hrp.eq(hrp))
-        .map(|x| x.clone())
+        .cloned()
         .collect::<Vec<BtcForkNetwork>>();
     ret.pop()
 }
@@ -225,3 +227,45 @@ pub fn pub_version_from_prv_version(prefix: &[u8]) -> Option<[u8; 4]> {
         version
     })
 }
+
+#[cfg(test)]
+mod test {
+    use crate::CurveType;
+
+    #[test]
+    fn test_network_form_hrp() {
+        let network = super::network_form_hrp("ltc");
+        assert_eq!(network.unwrap().coin, "LITECOIN");
+        let network = super::network_form_hrp("bitcoincash");
+        assert_eq!(network.unwrap().coin, "BITCOINCASH");
+    }
+
+    #[test]
+    fn test_coin_from_xpub_prefix() {
+        let coin = super::coin_from_xpub_prefix(&[0x04, 0x88, 0xB2, 0x1E]);
+        assert_eq!(coin.unwrap(), "LITECOIN");
+    }
+
+    #[test]
+    fn test_network_from_coin() {
+        let network = super::network_from_coin(&super::CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        })
+        .unwrap();
+
+        assert_eq!(network.network, "MAINNET");
+        assert_eq!(network.coin, "BITCOIN");
+    }
+
+    #[test]
+    fn test_pub_version_from_prv_version() {
+        let network = super::pub_version_from_prv_version(&[0x04, 0x88, 0xAD, 0xE4]);
+        assert_eq!(network.unwrap(), [4, 136, 178, 30]);
+        let network = super::pub_version_from_prv_version(&[0x04, 0x35, 0x83, 0x94]);
+        assert_eq!(network.unwrap(), [4, 53, 135, 207]);
+    }
+}
diff --git a/token-core/tcx-constants/src/coin_info.rs b/token-core/tcx-constants/src/coin_info.rs
index 808f102c..29f27454 100644
--- a/token-core/tcx-constants/src/coin_info.rs
+++ b/token-core/tcx-constants/src/coin_info.rs
@@ -1,12 +1,18 @@
 use crate::curve::CurveType;
 use crate::Result;
-use failure::format_err;
+use anyhow::anyhow;
+use tcx_common::FromHex;
 
 use parking_lot::RwLock;
 
+pub fn get_xpub_prefix(network: &str) -> Vec<u8> {
+    if network == "MAINNET" {
+        Vec::from_hex("0488b21e").unwrap()
+    } else {
+        Vec::from_hex("043587cf").unwrap()
+    }
+}
 /// Blockchain basic config
-///
-/// NOTE: Unique key field is `symbol`
 #[derive(Clone)]
 pub struct CoinInfo {
     pub coin: String,
@@ -16,163 +22,246 @@ pub struct CoinInfo {
     pub seg_wit: String,
 }
 
-lazy_static! {
-    static ref COIN_INFOS: RwLock<Vec<CoinInfo>> = {
-        let mut coin_infos = Vec::new();
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/44'/0'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/44'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/49'/0'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOIN".to_string(),
-            derivation_path: "m/49'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOINCASH".to_string(),
-            derivation_path: "m/44'/145'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "BITCOINCASH".to_string(),
-            derivation_path: "m/44'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/44'/2'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/44'/1'/0'/0/0".to_string(),
+impl Default for CoinInfo {
+    fn default() -> Self {
+        CoinInfo {
+            coin: "".to_string(),
+            derivation_path: "".to_string(),
             curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "NONE".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/49'/2'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "LITECOIN".to_string(),
-            derivation_path: "m/49'/1'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "P2WPKH".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "TRON".to_string(),
-            derivation_path: "m/44'/195'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "NERVOS".to_string(),
-            derivation_path: "m/44'/309'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "NERVOS".to_string(),
-            derivation_path: "m/44'/309'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "POLKADOT".to_string(),
-            derivation_path: "//polkadot//imToken/0".to_string(),
-            curve: CurveType::SubSr25519,
-            network: "".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "KUSAMA".to_string(),
-            derivation_path: "//kusama//imToken/0".to_string(),
-            curve: CurveType::SubSr25519,
             network: "".to_string(),
             seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "TEZOS".to_string(),
-            derivation_path: "m/44'/1729'/0'/0'".to_string(),
-            curve: CurveType::ED25519,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/44'/461'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/44'/461'/0'/0/0".to_string(),
-            curve: CurveType::SECP256k1,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/2334/461/0/0".to_string(),
-            curve: CurveType::BLS,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "m/2334/461/0/0".to_string(),
-            curve: CurveType::BLS,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "ETHEREUM2".to_string(),
-            derivation_path: "m/12381/3600/0/0".to_string(),
-            curve: CurveType::BLS,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        });
-        coin_infos.push(CoinInfo {
-            coin: "ETHEREUM2".to_string(),
-            derivation_path: "m/12381/3600/0/0".to_string(),
-            curve: CurveType::BLS,
-            network: "TESTNET".to_string(),
-            seg_wit: "".to_string(),
-        });
+        }
+    }
+}
+
+lazy_static! {
+    static ref COIN_INFOS: RwLock<Vec<CoinInfo>> = {
+        let coin_infos = vec![
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/86'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/86'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOINCASH".to_string(),
+                derivation_path: "m/44'/145'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOINCASH".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/44'/2'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/49'/2'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "LITECOIN".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "TRON".to_string(),
+                derivation_path: "m/44'/195'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "NERVOS".to_string(),
+                derivation_path: "m/44'/309'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "NERVOS".to_string(),
+                derivation_path: "m/44'/309'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "POLKADOT".to_string(),
+                derivation_path: "//polkadot//imToken/0".to_string(),
+                curve: CurveType::SR25519,
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "KUSAMA".to_string(),
+                derivation_path: "//kusama//imToken/0".to_string(),
+                curve: CurveType::SR25519,
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "TEZOS".to_string(),
+                derivation_path: "m/44'/1729'/0'/0'".to_string(),
+                curve: CurveType::ED25519,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/44'/461'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/44'/461'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/2334/461/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "FILECOIN".to_string(),
+                derivation_path: "m/2334/461/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM".to_string(),
+                derivation_path: "m/44'/60'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM".to_string(),
+                derivation_path: "m/44'/60'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM2".to_string(),
+                derivation_path: "m/12381/3600/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "ETHEREUM2".to_string(),
+                derivation_path: "m/12381/3600/0/0".to_string(),
+                curve: CurveType::BLS,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "COSMOS".to_string(),
+                derivation_path: "m/44'/118'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "EOS".to_string(),
+                derivation_path: "m/44'/194'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "COSMOS".to_string(),
+                derivation_path: "m/44'/118'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+            CoinInfo {
+                coin: "EOS".to_string(),
+                derivation_path: "m/44'/194'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+        ];
 
         RwLock::new(coin_infos)
     };
@@ -193,12 +282,44 @@ pub fn coin_info_from_param(
                 && (x.seg_wit.as_str() == seg_wit || seg_wit.is_empty())
                 && (x.curve.as_str() == curve || curve.is_empty())
         })
-        .map(|x| x.clone())
+        .cloned()
         .collect::<Vec<CoinInfo>>();
 
     if coins.is_empty() {
-        Err(format_err!("unsupported_chain"))
+        Err(anyhow!("unsupported_chain"))
     } else {
         Ok(coins.pop().expect("coin_info_from_param"))
     }
 }
+
+#[cfg(test)]
+mod test {
+
+    #[test]
+    fn test_coin_info_default() {
+        let coin_info = super::CoinInfo::default();
+        assert_eq!(coin_info.coin, "");
+        assert_eq!(coin_info.derivation_path, "");
+        assert_eq!(coin_info.curve, super::CurveType::SECP256k1);
+        assert_eq!(coin_info.network, "");
+        assert_eq!(coin_info.seg_wit, "");
+    }
+
+    #[test]
+    fn test_coin_info_from_param_unsupported_chain() {
+        let coin_info = super::coin_info_from_param("TEST", "MAINNET", "NONE", "secp256k1");
+        assert_eq!(coin_info.err().unwrap().to_string(), "unsupported_chain");
+    }
+
+    #[test]
+    fn test_coin_info_from_param() {
+        let coin_info =
+            super::coin_info_from_param("BITCOIN", "MAINNET", "NONE", "secp256k1").unwrap();
+
+        assert_eq!(coin_info.coin, "BITCOIN");
+        assert_eq!(coin_info.derivation_path, "m/44'/0'/0'/0/0");
+        assert_eq!(coin_info.curve, super::CurveType::SECP256k1);
+        assert_eq!(coin_info.network, "MAINNET");
+        assert_eq!(coin_info.seg_wit, "NONE");
+    }
+}
diff --git a/token-core/tcx-constants/src/curve.rs b/token-core/tcx-constants/src/curve.rs
index e002daa1..06408ece 100644
--- a/token-core/tcx-constants/src/curve.rs
+++ b/token-core/tcx-constants/src/curve.rs
@@ -2,25 +2,82 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub enum CurveType {
-    SECP256k1,          /* "secp256k1" */
-    ED25519,            /* "ed25519" */
-    ED25519Blake2bNano, /* "ed25519-blake2b-nano" */
-    SubSr25519,
-    Curve25519, /* "curve25519" */
+    #[serde(rename = "secp256k1")]
+    SECP256k1,
+    #[serde(rename = "ed25519")]
+    ED25519,
+    #[serde(rename = "ed25519-blake2b-nano")]
+    ED25519Blake2bNano,
+    #[serde(rename = "sr25519")]
+    SR25519,
+    #[serde(rename = "curve25519")]
+    Curve25519,
+    #[serde(rename = "nist256p1")]
     NIST256p1,
-    BLS, /* "bls" */
+    #[serde(rename = "bls12-381")]
+    BLS,
 }
 
 impl CurveType {
     pub fn as_str(&self) -> &str {
         match self {
-            CurveType::SECP256k1 => "SECP256k1",
-            CurveType::ED25519 => "ED25519",
-            CurveType::ED25519Blake2bNano => "ED25519Blake2bNano",
-            CurveType::SubSr25519 => "SubSr25519",
-            CurveType::Curve25519 => "Curve25519",
-            CurveType::NIST256p1 => "NIST256p1",
-            CurveType::BLS => "BLS",
+            CurveType::SECP256k1 => "secp256k1",
+            CurveType::ED25519 => "ed25519",
+            CurveType::ED25519Blake2bNano => "ed25519-blake2b-nano",
+            CurveType::SR25519 => "sr25519",
+            CurveType::Curve25519 => "curve25519",
+            CurveType::NIST256p1 => "nist256p1",
+            CurveType::BLS => "bls12-381",
         }
     }
+
+    pub fn from_str(value: &str) -> CurveType {
+        match value {
+            "secp256k1" => CurveType::SECP256k1,
+            "ed25519" => CurveType::ED25519,
+            "ed25519-blake2b-nano" => CurveType::ED25519Blake2bNano,
+            "sr25519" => CurveType::SR25519,
+            "curve25519" => CurveType::Curve25519,
+            "nist256p1" => CurveType::NIST256p1,
+            "bls12-381" => CurveType::BLS,
+            _ => panic!("Invalid curve type"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::CurveType;
+
+    #[test]
+    fn test_curve_type_as_str() {
+        assert_eq!(CurveType::SECP256k1.as_str(), "secp256k1");
+        assert_eq!(CurveType::ED25519.as_str(), "ed25519");
+        assert_eq!(
+            CurveType::ED25519Blake2bNano.as_str(),
+            "ed25519-blake2b-nano"
+        );
+        assert_eq!(CurveType::SR25519.as_str(), "sr25519");
+        assert_eq!(CurveType::Curve25519.as_str(), "curve25519");
+        assert_eq!(CurveType::NIST256p1.as_str(), "nist256p1");
+        assert_eq!(CurveType::BLS.as_str(), "bls12-381");
+    }
+
+    #[test]
+    fn test_curve_type_from_str() {
+        let curve_type = CurveType::from_str("secp256k1");
+        assert_eq!(curve_type, CurveType::SECP256k1);
+        let curve_type = CurveType::from_str("ed25519");
+        assert_eq!(curve_type, CurveType::ED25519);
+        let curve_type = CurveType::from_str("ed25519-blake2b-nano");
+        assert_eq!(curve_type, CurveType::ED25519Blake2bNano);
+        let curve_type = CurveType::from_str("sr25519");
+        assert_eq!(curve_type, CurveType::SR25519);
+        let curve_type = CurveType::from_str("curve25519");
+        assert_eq!(curve_type, CurveType::Curve25519);
+        let curve_type = CurveType::from_str("nist256p1");
+        assert_eq!(curve_type, CurveType::NIST256p1);
+        let curve_type = CurveType::from_str("bls12-381");
+        assert_eq!(curve_type, CurveType::BLS);
+    }
 }
diff --git a/token-core/tcx-constants/src/lib.rs b/token-core/tcx-constants/src/lib.rs
index 9ead7b79..1cdef6d2 100644
--- a/token-core/tcx-constants/src/lib.rs
+++ b/token-core/tcx-constants/src/lib.rs
@@ -1,6 +1,7 @@
 pub mod btc_fork_network;
 pub mod coin_info;
 pub mod curve;
+pub mod sample_key;
 
 pub use btc_fork_network::{
     coin_from_xpub_prefix, network_form_hrp, network_from_coin, pub_version_from_prv_version,
@@ -9,11 +10,17 @@ pub use btc_fork_network::{
 pub use coin_info::{coin_info_from_param, CoinInfo};
 pub use curve::CurveType;
 
-pub type Result<T> = std::result::Result<T, failure::Error>;
+pub type Result<T> = std::result::Result<T, anyhow::Error>;
 
 #[macro_use]
 extern crate lazy_static;
 
-pub const TEST_MNEMONIC: &'static str =
+pub const TEST_MNEMONIC: &str =
     "inject kidney empty canal shadow pact comfort wife crush horse wife sketch";
-pub const TEST_PASSWORD: &'static str = "Insecure Pa55w0rd";
+pub const TEST_PASSWORD: &str = "Insecure Pa55w0rd";
+
+pub const TEST_WIF: &str = "cT4fTJyLd5RmSZFHnkGmVCzXDKuJLbyTt7cy77ghTTCagzNdPH1j";
+pub const TEST_PRIVATE_KEY: &str =
+    "cce64585e3b15a0e4ee601a467e050c9504a0db69a559d7ec416fa25ad3410c2";
+pub const OTHER_MNEMONIC: &'static str =
+    "calm release clay imitate top extend close draw quiz refuse shuffle injury";
diff --git a/token-core/tcx-constants/src/sample_key.rs b/token-core/tcx-constants/src/sample_key.rs
new file mode 100644
index 00000000..d2645eca
--- /dev/null
+++ b/token-core/tcx-constants/src/sample_key.rs
@@ -0,0 +1,10 @@
+pub const NAME: &str = "imToken Test";
+pub const PASSWORD: &str = "Insecure Pa55w0rd";
+pub const NEW_PASSWORD: &str = "NEW_Password";
+pub const WRONG_PASSWORD: &str = "Wrong Password";
+pub const PASSWORD_HINT: &str = "Password Hint";
+
+pub const MNEMONIC: &str =
+    "inject kidney empty canal shadow pact comfort wife crush horse wife sketch";
+
+pub const PRIVATE_KEY: &str = "0xcce64585e3b15a0e4ee601a467e050c9504a0db69a559d7ec416fa25ad3410c2";
diff --git a/token-core/tcx-crypto/Cargo.toml b/token-core/tcx-crypto/Cargo.toml
index ff6f0735..fb63c9ec 100644
--- a/token-core/tcx-crypto/Cargo.toml
+++ b/token-core/tcx-crypto/Cargo.toml
@@ -2,31 +2,35 @@
 name = "tcx-crypto"
 version = "0.1.0"
 authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 tcx-constants = {path="../tcx-constants"}
-serde_json = "1.0.88"
-serde = { version = "1.0.147", features = ["derive"] }
-rand = "0.8.5"
-tiny-keccak = { version = "2.0.2", features = ["keccak"] }
-scrypt = { version = "0.10.0", default-features = false }
-sha2 = "0.10.6"
-digest = "0.10.6"
-hmac = "0.12.1"
-block-modes = "0.7.0"
-aes-ctr = "0.6.0"
-aes-soft = "0.6.4"
-pbkdf2 = "0.11.0"
-bitcoin_hashes = "0.11.0"
-crypto-mac = "0.11.1"
-failure = "0.1.8"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-hex = "0.4.3"
-lazy_static = "1.4.0"
+tcx-common = {path="../tcx-common"}
 
-parking_lot = "0.12.1"
+serde_json = "=1.0.89"
+serde = { version = "=1.0.147", features = ["derive"] }
+rand = "=0.8.5"
+tiny-keccak = { version = "=2.0.2", features = ["keccak"] }
+scrypt = { version = "=0.10.0", default-features = false }
+sha2 = "=0.10.6"
+digest = "=0.10.6"
+hmac = "=0.12.1"
+aes = "=0.8.3"
+ctr = "=0.9.2"
+cbc = "=0.1.2"
+pbkdf2 = "=0.11.0"
+bitcoin_hashes = "=0.11.0"
+crypto-mac = "=0.11.1"
+anyhow = { version = "=1.0.79", features = [] }
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+hex = "=0.4.3"
+lazy_static = "=1.4.0"
+regex = "=1.9.3"
+
+parking_lot = "=0.12.1"
+thiserror = "=1.0.56"
 
 [features]
 default = []
-cache_dk = []
\ No newline at end of file
+cache_dk = []
diff --git a/token-core/tcx-crypto/src/aes.rs b/token-core/tcx-crypto/src/aes.rs
index 0fd5855e..f253c9d8 100644
--- a/token-core/tcx-crypto/src/aes.rs
+++ b/token-core/tcx-crypto/src/aes.rs
@@ -1,9 +1,10 @@
 pub mod ctr {
-    use aes_ctr::Aes128Ctr;
-
     use crate::{Error, Result};
-    use aes_ctr::cipher::generic_array::GenericArray;
-    use aes_ctr::cipher::{NewStreamCipher, SyncStreamCipher};
+    use aes::cipher::generic_array::GenericArray;
+    use aes::cipher::{KeyIvInit, StreamCipher};
+
+    type Aes128CtrEnc = ctr::Ctr128BE<aes::Aes128>;
+    type Aes128CtrDec = ctr::Ctr128BE<aes::Aes128>;
 
     pub fn encrypt_nopadding(data: &[u8], key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
         if key.len() != 16 || iv.len() != 16 {
@@ -11,7 +12,7 @@ pub mod ctr {
         }
         let key = GenericArray::from_slice(key);
         let iv = GenericArray::from_slice(iv);
-        let mut cipher = Aes128Ctr::new(key, iv);
+        let mut cipher = Aes128CtrEnc::new(key, iv);
         let mut data_copy = vec![0; data.len()];
         data_copy.copy_from_slice(data);
         cipher.apply_keystream(&mut data_copy);
@@ -24,7 +25,7 @@ pub mod ctr {
         }
         let key = GenericArray::from_slice(key);
         let iv = GenericArray::from_slice(iv);
-        let mut cipher = Aes128Ctr::new(key, iv);
+        let mut cipher = Aes128CtrDec::new(key, iv);
         let mut data_copy = vec![0; data.len()];
         data_copy.copy_from_slice(data);
         cipher.apply_keystream(&mut data_copy);
@@ -33,26 +34,39 @@ pub mod ctr {
 }
 
 pub mod cbc {
-    extern crate aes_soft;
-    extern crate block_modes;
-    use crate::Error;
-    use crate::Result;
-    use aes_soft::Aes128;
-    use block_modes::block_padding::Pkcs7;
-    use block_modes::{BlockMode, Cbc};
 
-    type Aes128Cbc = Cbc<Aes128, Pkcs7>;
+    use crate::{Error, Result};
+    use aes::cipher::generic_array::GenericArray;
+    use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, BlockEncryptMut, KeyIvInit};
 
+    type Aes128CbcEnc = cbc::Encryptor<aes::Aes128>;
+    type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
+    #[inline]
     pub fn encrypt_pkcs7(data: &[u8], key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
-        let cipher = Aes128Cbc::new_var(key, iv)?;
-        Ok(cipher.encrypt_vec(data))
+        if key.len() != 16 || iv.len() != 16 {
+            return Err(Error::InvalidKeyIvLength.into());
+        }
+        let padding_len = 16 - (data.len() % 16);
+        let mut buf = vec![0u8; data.len() + padding_len];
+        let ct = Aes128CbcEnc::new(key.into(), iv.into())
+            .encrypt_padded_b2b_mut::<Pkcs7>(data, &mut buf)
+            .unwrap();
+
+        Ok(ct.to_vec())
     }
 
+    #[inline]
     pub fn decrypt_pkcs7(encrypted: &[u8], key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
-        let cipher = Aes128Cbc::new_var(key, iv)?;
-        cipher
-            .decrypt_vec(encrypted)
-            .map_err(|_| Error::InvalidCiphertext.into())
+        if key.len() != 16 || iv.len() != 16 {
+            return Err(Error::InvalidKeyIvLength.into());
+        }
+        let mut buf = vec![0u8; encrypted.len()];
+        let key = GenericArray::from_slice(key);
+        let iv = GenericArray::from_slice(iv);
+        let pt = Aes128CbcDec::new(key, iv)
+            .decrypt_padded_b2b_mut::<Pkcs7>(encrypted, &mut buf)
+            .unwrap();
+        Ok(pt.to_vec())
     }
 }
 
@@ -61,33 +75,33 @@ mod tests {
 
     use crate::aes::cbc::{decrypt_pkcs7, encrypt_pkcs7};
     use crate::aes::ctr::{decrypt_nopadding, encrypt_nopadding};
-    use bitcoin_hashes::hex::ToHex;
+    use tcx_common::{FromHex, ToHex};
 
     #[test]
-    fn encrypt_nopadding_test() {
+    fn test_encrypt_nopadding() {
         let data = "TokenCoreX".as_bytes();
-        let key = hex::decode("01020304010203040102030401020304").unwrap();
-        let iv = hex::decode("01020304010203040102030401020304").unwrap();
+        let key = Vec::from_hex("01020304010203040102030401020304").unwrap();
+        let iv = Vec::from_hex("01020304010203040102030401020304").unwrap();
         let ret = encrypt_nopadding(&data, &key, &iv).expect("encrypt nopadding data");
         let ret_hex = ret.to_hex();
 
         assert_eq!("e19e6c5923d33c587cf8", ret_hex);
 
-        let wrong_len_key = hex::decode("010203040102030401020304").unwrap();
+        let wrong_len_key = Vec::from_hex("010203040102030401020304").unwrap();
         let ret = encrypt_nopadding(&data, &wrong_len_key, &iv);
         assert!(ret.is_err());
 
-        let wrong_len_iv = hex::decode("010203040102030401020304").unwrap();
+        let wrong_len_iv = Vec::from_hex("010203040102030401020304").unwrap();
         let ret = encrypt_nopadding(&data, &key, &wrong_len_iv);
         assert!(ret.is_err());
     }
 
     #[test]
-    fn decrypted_data_test() {
+    fn test_decrypted_data() {
         let data = "TokenCoreX".as_bytes();
-        let encrypted_data = hex::decode("e19e6c5923d33c587cf8").unwrap();
-        let key = hex::decode("01020304010203040102030401020304").unwrap();
-        let iv = hex::decode("01020304010203040102030401020304").unwrap();
+        let encrypted_data = Vec::from_hex("e19e6c5923d33c587cf8").unwrap();
+        let key = Vec::from_hex("01020304010203040102030401020304").unwrap();
+        let iv = Vec::from_hex("01020304010203040102030401020304").unwrap();
         let ret = decrypt_nopadding(&encrypted_data, &key, &iv).expect("decrypted data error");
 
         assert_eq!(
@@ -95,20 +109,20 @@ mod tests {
             String::from_utf8(ret).expect("decrypted failed")
         );
 
-        let wrong_len_key = hex::decode("010203040102030401020304").unwrap();
+        let wrong_len_key = Vec::from_hex("010203040102030401020304").unwrap();
         let ret = decrypt_nopadding(&data, &wrong_len_key, &iv);
         assert!(ret.is_err());
 
-        let wrong_len_iv = hex::decode("010203040102030401020304").unwrap();
+        let wrong_len_iv = Vec::from_hex("010203040102030401020304").unwrap();
         let ret = decrypt_nopadding(&data, &key, &wrong_len_iv);
         assert!(ret.is_err());
     }
 
     #[test]
-    fn encrypt_pkcs7_test() {
+    fn test_encrypt_pkcs7() {
         let data = "TokenCoreX".as_bytes();
-        let key = hex::decode("01020304010203040102030401020304").unwrap();
-        let iv = hex::decode("01020304010203040102030401020304").unwrap();
+        let key = Vec::from_hex("01020304010203040102030401020304").unwrap();
+        let iv = Vec::from_hex("01020304010203040102030401020304").unwrap();
         let ret = encrypt_pkcs7(&data, &key, &iv).expect("encrypt_pkcs7");
         let ret_hex = ret.to_hex();
 
@@ -117,11 +131,11 @@ mod tests {
         let decrypted = decrypt_pkcs7(&ret, &key, &iv).unwrap();
         assert_eq!("TokenCoreX", String::from_utf8(decrypted).unwrap());
 
-        let wrong_len_key = hex::decode("010203040102030401020304").unwrap();
+        let wrong_len_key = Vec::from_hex("010203040102030401020304").unwrap();
         let ret = encrypt_pkcs7(&data, &wrong_len_key, &iv);
 
         assert!(ret.is_err());
-        let wrong_len_iv = hex::decode("010203040102030401020304").unwrap();
+        let wrong_len_iv = Vec::from_hex("010203040102030401020304").unwrap();
         let ret = encrypt_pkcs7(&data, &key, &wrong_len_iv);
         assert!(ret.is_err());
     }
diff --git a/token-core/tcx-crypto/src/crypto.rs b/token-core/tcx-crypto/src/crypto.rs
index 755c7f90..ad775735 100644
--- a/token-core/tcx-crypto/src/crypto.rs
+++ b/token-core/tcx-crypto/src/crypto.rs
@@ -1,10 +1,8 @@
-use crate::hash::hex_dsha256;
-use crate::numberic_util;
 use crate::Error;
 use crate::Result;
-use bitcoin_hashes::hex::{FromHex, ToHex};
 use serde::{Deserialize, Serialize};
 use std::env;
+use tcx_common::{random_u8_16, random_u8_32, FromHex, ToHex};
 use tiny_keccak::Hasher;
 
 const CREDENTIAL_LEN: usize = 64usize;
@@ -13,36 +11,36 @@ pub type Credential = [u8; CREDENTIAL_LEN];
 
 fn default_kdf_rounds() -> u32 {
     let v = env::var("KDF_ROUNDS");
-    if v.is_err() {
-        *crate::KDF_ROUNDS.read() as u32
+    if let Ok(v) = v {
+        v.parse::<u32>().unwrap()
     } else {
-        v.unwrap().parse::<u32>().unwrap()
+        *crate::KDF_ROUNDS.read() as u32
     }
 }
 
+#[derive(Clone)]
 pub enum Key {
     Password(String),
     DerivedKey(String),
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct EncPair {
     pub enc_str: String,
     pub nonce: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
 struct CipherParams {
     iv: String,
 }
 
 pub trait KdfParams: Default {
-    fn kdf_key() -> String;
+    fn name(&self) -> &str;
     fn validate(&self) -> Result<()>;
-    fn generate_derived_key(&self, password: &[u8], out: &mut [u8]);
-    fn set_salt(&mut self, salt: &str);
+    fn derive_key(&self, password: &[u8], out: &mut [u8]);
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -66,8 +64,8 @@ impl Default for Pbkdf2Params {
 }
 
 impl KdfParams for Pbkdf2Params {
-    fn kdf_key() -> String {
-        "pbkdf2".to_owned()
+    fn name(&self) -> &str {
+        "pbkdf2"
     }
 
     fn validate(&self) -> Result<()> {
@@ -78,14 +76,10 @@ impl KdfParams for Pbkdf2Params {
         }
     }
 
-    fn generate_derived_key(&self, password: &[u8], out: &mut [u8]) {
+    fn derive_key(&self, password: &[u8], out: &mut [u8]) {
         let salt_bytes: Vec<u8> = FromHex::from_hex(&self.salt).unwrap();
         pbkdf2::pbkdf2::<hmac::Hmac<sha2::Sha256>>(password, &salt_bytes, self.c, out);
     }
-
-    fn set_salt(&mut self, salt: &str) {
-        self.salt = salt.to_owned();
-    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -111,8 +105,8 @@ impl Default for SCryptParams {
 }
 
 impl KdfParams for SCryptParams {
-    fn kdf_key() -> String {
-        "scrypt".to_owned()
+    fn name(&self) -> &str {
+        "scrypt"
     }
 
     fn validate(&self) -> Result<()> {
@@ -123,7 +117,7 @@ impl KdfParams for SCryptParams {
         }
     }
 
-    fn generate_derived_key(&self, password: &[u8], out: &mut [u8]) {
+    fn derive_key(&self, password: &[u8], out: &mut [u8]) {
         let salt_bytes: Vec<u8> = FromHex::from_hex(&self.salt).unwrap();
         let log_n = (self.n as f64).log2().round();
         let inner_params =
@@ -131,10 +125,6 @@ impl KdfParams for SCryptParams {
 
         scrypt::scrypt(password, &salt_bytes, &inner_params, out).expect("can not execute scrypt");
     }
-
-    fn set_salt(&mut self, salt: &str) {
-        self.salt = salt.to_owned();
-    }
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -144,7 +134,7 @@ struct CacheDerivedKey {
 }
 
 impl CacheDerivedKey {
-    pub fn new(key: &str, derived_key: &[u8]) -> CacheDerivedKey {
+    pub fn new(key: &str, derived_key: &[u8]) -> Self {
         CacheDerivedKey {
             hashed_key: Self::hash(key),
             derived_key: derived_key.to_vec(),
@@ -152,7 +142,10 @@ impl CacheDerivedKey {
     }
 
     fn hash(key: &str) -> String {
-        hex_dsha256(key)
+        // hex_dsha256(key)
+        let key_bytes = Vec::from_hex(key).expect("hash cache derived key");
+        let hashed = tcx_common::sha256d(&key_bytes);
+        hashed.to_hex()
     }
 
     pub fn get_derived_key(&self, key: &str) -> Result<Vec<u8>> {
@@ -164,172 +157,246 @@ impl CacheDerivedKey {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
-pub struct Crypto<T: KdfParams> {
+pub struct Crypto {
     cipher: String,
     cipherparams: CipherParams,
     ciphertext: String,
-    kdf: String,
-    kdfparams: T,
+    #[serde(flatten)]
+    kdf: KdfType,
     mac: String,
-    #[serde(skip)]
-    cached_derived_key: Option<CacheDerivedKey>,
 }
 
-impl<T> Crypto<T>
-where
-    T: KdfParams,
-{
-    pub fn new(password: &str, origin: &[u8]) -> Crypto<T> {
-        let mut param = T::default();
-        param.set_salt(&numberic_util::random_iv(32).to_hex());
-        let iv = numberic_util::random_iv(16);
+pub struct Unlocker<'a> {
+    pub crypto: &'a Crypto,
+    derived_key: Vec<u8>,
+}
+
+fn encrypt(plaintext: &[u8], derived_key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
+    let key = &derived_key[0..16];
+    super::aes::ctr::encrypt_nopadding(plaintext, key, iv)
+}
+
+fn decrypt(ciphertext: &[u8], derived_key: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
+    let key = &derived_key[0..16];
+    super::aes::ctr::decrypt_nopadding(ciphertext, key, iv)
+}
+
+fn generate_mac(derived_key: &[u8], ciphertext: &[u8]) -> Vec<u8> {
+    let result = [&derived_key[16..32], ciphertext].concat();
+    let mut keccak = tiny_keccak::Keccak::v256();
+    keccak.update(result.as_slice());
+    let mut output = [0u8; 32];
+    keccak.finalize(&mut output);
+    output.to_vec()
+}
+
+fn encrypt_with_random_iv(derived_key: &[u8], plaintext: &[u8]) -> Result<EncPair> {
+    let iv = random_u8_16();
+    let ciphertext = encrypt(plaintext, derived_key, &iv)?;
+    Ok(EncPair {
+        enc_str: ciphertext.to_hex(),
+        nonce: iv.to_hex(),
+    })
+}
+
+fn decrypt_enc_pair(derived_key: &[u8], enc_pair: &EncPair) -> Result<Vec<u8>> {
+    let ciphertext: Vec<u8> = Vec::from_hex(&enc_pair.enc_str).unwrap();
+    let iv: Vec<u8> = Vec::from_hex(&enc_pair.nonce).unwrap();
+
+    decrypt(&ciphertext, derived_key, &iv)
+}
+
+impl<'a> Unlocker<'a> {
+    pub fn derived_key(&self) -> &[u8] {
+        &self.derived_key
+    }
+
+    pub fn plaintext(&self) -> Result<Vec<u8>> {
+        self.crypto.decrypt(self.derived_key())
+    }
+
+    pub fn encrypt_with_random_iv(&self, plaintext: &[u8]) -> Result<EncPair> {
+        encrypt_with_random_iv(&self.derived_key, plaintext)
+    }
+
+    pub fn decrypt_enc_pair(&self, enc_pair: &EncPair) -> Result<Vec<u8>> {
+        decrypt_enc_pair(&self.derived_key, enc_pair)
+    }
+}
+
+impl Crypto {
+    pub fn use_key(&self, key: &Key) -> Result<Unlocker> {
+        match key {
+            Key::Password(password) => {
+                let derived_key = self.derive_key(password)?;
+                if !self.mac.is_empty() && !self.verify_derived_key(&derived_key) {
+                    return Err(Error::PasswordIncorrect.into());
+                }
+
+                Ok(Unlocker {
+                    crypto: self,
+                    derived_key,
+                })
+            }
+            Key::DerivedKey(derived_key_hex) => {
+                let derived_key = Vec::from_hex_auto(derived_key_hex)?;
+                if !self.verify_derived_key(&derived_key) {
+                    return Err(Error::PasswordIncorrect.into());
+                }
+
+                Ok(Unlocker {
+                    crypto: self,
+                    derived_key,
+                })
+            }
+        }
+    }
+
+    pub fn new(password: &str, origin: &[u8]) -> Crypto {
+        let param = Pbkdf2Params {
+            salt: random_u8_32().to_hex(),
+            ..Pbkdf2Params::default()
+        };
+
+        Self::new_with_kdf(password, origin, KdfType::Pbkdf2(param))
+    }
+
+    pub fn new_with_kdf(password: &str, plaintext: &[u8], kdf: KdfType) -> Crypto {
+        let iv = random_u8_16();
 
         let mut crypto = Crypto {
             cipher: "aes-128-ctr".to_owned(),
             cipherparams: CipherParams { iv: iv.to_hex() },
             ciphertext: String::from(""),
-            kdf: T::kdf_key(),
-            kdfparams: param,
+            kdf,
             mac: String::from(""),
-            cached_derived_key: None,
         };
 
-        let derived_key = crypto
-            .generate_derived_key(password)
-            .expect("new crypto generate_derived_key");
+        let derived_key = crypto.derive_key(password).expect("derive key");
+        let ciphertext = crypto.encrypt(&derived_key, plaintext).expect("encrypt");
+        let mac = generate_mac(&derived_key, &ciphertext);
 
-        let ciphertext = crypto.encrypt(password, origin);
         crypto.ciphertext = ciphertext.to_hex();
-        let mac = Self::generate_mac(&derived_key, &ciphertext);
         crypto.mac = mac.to_hex();
+
         crypto
     }
 
-    pub fn generate_derived_key(&self, key: &str) -> Result<Vec<u8>> {
-        if let Some(ckd) = &self.cached_derived_key {
-            ckd.get_derived_key(key)
-        } else {
-            let mut derived_key: Credential = [0u8; CREDENTIAL_LEN];
-            self.kdfparams
-                .generate_derived_key(key.as_bytes(), &mut derived_key);
-            if &self.mac != "" && !self.verify_derived_key(&derived_key) {
-                return Err(Error::PasswordIncorrect.into());
-            }
-            Ok(derived_key.to_vec())
-        }
-    }
+    /*
+     * used to update the ciphertext, but without changing the the derived key.
+     */
+    pub fn dangerous_rewrite_plaintext(
+        &mut self,
+        derived_key: &[u8],
+        plaintext: &[u8],
+    ) -> Result<()> {
+        let ciphertext = self.encrypt(derived_key, plaintext).expect("encrypt");
+        let mac = generate_mac(derived_key, &ciphertext);
 
-    pub fn decrypt(&self, key: Key) -> Result<Vec<u8>> {
-        let encrypted: Vec<u8> = FromHex::from_hex(&self.ciphertext).expect("ciphertext");
-        let iv: Vec<u8> = FromHex::from_hex(&self.cipherparams.iv).expect("iv");
-        self.decrypt_data(key, &encrypted, &iv)
-    }
+        self.ciphertext = ciphertext.to_hex();
+        self.mac = mac.to_hex();
 
-    fn encrypt(&self, password: &str, origin: &[u8]) -> Vec<u8> {
-        let derived_key = self
-            .generate_derived_key(password)
-            .expect("crypto::encrypt must no error");
-        let key = &derived_key[0..16];
-        let iv: Vec<u8> = FromHex::from_hex(&self.cipherparams.iv).unwrap();
-        super::aes::ctr::encrypt_nopadding(origin, key, &iv)
-            .expect("encrypt_nopadding key or iv's length must be 16")
+        Ok(())
     }
 
-    pub fn derive_enc_pair(&self, password: &str, origin: &[u8]) -> Result<EncPair> {
-        let iv = numberic_util::random_iv(16);
-        let encrypted_data = self.encrypt_data(password, origin, &iv)?;
-        Ok(EncPair {
-            enc_str: encrypted_data.to_hex(),
-            nonce: iv.to_hex(),
-        })
-    }
+    fn derive_key(&self, password: &str) -> Result<Vec<u8>> {
+        let mut derived_key: Credential = [0u8; CREDENTIAL_LEN];
+        self.kdf.derive_key(password.as_bytes(), &mut derived_key);
 
-    pub fn decrypt_enc_pair(&self, key: Key, enc_pair: &EncPair) -> Result<Vec<u8>> {
-        let encrypted: Vec<u8> = FromHex::from_hex(&enc_pair.enc_str).unwrap();
-        let iv: Vec<u8> = FromHex::from_hex(&enc_pair.nonce).unwrap();
-        self.decrypt_data(key, &encrypted, &iv)
+        Ok(derived_key.to_vec())
     }
 
-    pub fn verify_password(&self, password: &str) -> bool {
-        let derived_key_ret = self.generate_derived_key(password);
-
-        derived_key_ret.is_ok() && self.verify_derived_key(&derived_key_ret.expect(""))
+    fn decrypt(&self, derived_key: &[u8]) -> Result<Vec<u8>> {
+        let ciphertext: Vec<u8> = FromHex::from_hex(&self.ciphertext).expect("ciphertext");
+        let iv: Vec<u8> = FromHex::from_hex(&self.cipherparams.iv).expect("iv");
+        decrypt(&ciphertext, derived_key, &iv)
     }
 
-    fn encrypt_data(&self, password: &str, origin: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
-        let derived_key = self.generate_derived_key(password)?;
-
-        if !self.verify_derived_key(&derived_key) {
-            return Err(Error::PasswordIncorrect.into());
-        }
-
-        let key = &derived_key[0..16];
-        super::aes::ctr::encrypt_nopadding(origin, key, &iv)
+    fn encrypt(&self, derived_key: &[u8], plaintext: &[u8]) -> Result<Vec<u8>> {
+        let iv: Vec<u8> = Vec::from_hex(&self.cipherparams.iv).unwrap();
+        encrypt(plaintext, derived_key, &iv)
     }
 
-    fn decrypt_data(&self, key: Key, encrypted: &[u8], iv: &[u8]) -> Result<Vec<u8>> {
-        let derived_key: Vec<u8> = match key {
-            Key::Password(password) => {
-                let dk = self.generate_derived_key(&password)?;
-                if !self.verify_derived_key(&dk) {
-                    return Err(Error::PasswordIncorrect.into());
-                } else {
-                    dk
-                }
-            }
-            Key::DerivedKey(dk) => {
-                if !(cfg!(feature = "cache_dk")) {
-                    return Err(Error::CachedDkFeatureNotSupport.into());
-                } else {
-                    let dk = hex::decode(dk)?;
-                    if !self.verify_derived_key(&dk) {
-                        return Err(Error::DerivedKeyNotMatched.into());
-                    } else {
-                        dk
-                    }
-                }
-            }
-        };
-
-        let key = &derived_key[0..16];
-        super::aes::ctr::decrypt_nopadding(encrypted, key, &iv)
+    pub fn verify_password(&self, password: &str) -> bool {
+        let derived_key_ret = self.derive_key(password);
+        derived_key_ret.is_ok() && self.verify_derived_key(&derived_key_ret.expect(""))
     }
 
     pub fn verify_derived_key(&self, dk: &[u8]) -> bool {
         let cipher_bytes = Vec::from_hex(&self.ciphertext).expect("vec::from_hex");
-        let mac = Self::generate_mac(&dk, &cipher_bytes);
+        let mac = generate_mac(dk, &cipher_bytes);
         self.mac == mac.to_hex()
     }
+}
 
-    fn generate_mac(derived_key: &[u8], ciphertext: &[u8]) -> Vec<u8> {
-        let result = [&derived_key[16..32], ciphertext].concat();
-        let mut keccak = tiny_keccak::Keccak::v256();
-        keccak.update(result.as_slice());
-        let mut output = [0u8; 32];
-        keccak.finalize(&mut output);
-        output.to_vec()
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(tag = "kdf", content = "kdfparams")]
+pub enum KdfType {
+    #[serde(rename = "pbkdf2")]
+    Pbkdf2(Pbkdf2Params),
+
+    #[serde(rename = "scrypt")]
+    Scrypt(SCryptParams),
+}
+
+impl Default for KdfType {
+    fn default() -> Self {
+        KdfType::Pbkdf2(Pbkdf2Params::default())
     }
+}
 
-    pub fn cache_derived_key(&mut self, key: &str, derived_key: &[u8]) {
-        let cdk = CacheDerivedKey::new(key, derived_key);
-        self.cached_derived_key = Some(cdk);
+impl KdfParams for KdfType {
+    fn name(&self) -> &str {
+        match self {
+            KdfType::Pbkdf2(_) => "pbkdf2",
+            KdfType::Scrypt(_) => "scrypt",
+        }
     }
 
-    pub fn clear_cache_derived_key(&mut self) {
-        self.cached_derived_key = None;
+    fn validate(&self) -> Result<()> {
+        match self {
+            KdfType::Pbkdf2(pbkdf2) => pbkdf2.validate(),
+            KdfType::Scrypt(scrypt) => scrypt.validate(),
+        }
+    }
+    fn derive_key(&self, password: &[u8], out: &mut [u8]) {
+        match self {
+            KdfType::Pbkdf2(pbkdf2) => pbkdf2.derive_key(password, out),
+            KdfType::Scrypt(scrypt) => scrypt.derive_key(password, out),
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use failure::_core::str::FromStr;
+    use std::str::FromStr;
+    use tcx_common::random_u8_64;
     use tcx_constants::TEST_PASSWORD;
 
+    fn sample_json_str() -> &'static str {
+        r#"
+    {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "2cb9d4457b284e47877d08a5c9493b46"
+    },
+    "ciphertext": "17ff4858e697455f4966c6072473f3501534bc20deb339b58aeb8db0bd9fe91777148d0a909f679fb6e3a7a64609034afeb72a",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "37890eb305866aa07853d14e7666c2ed31e18efc1129f1c5a66b9cc93d03fd73"
+    },
+    "mac": "4906577f075ad714f328e7b33829fdccfa8cd22eab2c0a8bc4f577824188ed16"
+  }"#
+    }
+
     #[test]
-    pub fn pbkdf2_params_default_test() {
+    fn test_pbkdf2_params_default() {
         let param = Pbkdf2Params::default();
         let default = Pbkdf2Params {
             c: default_kdf_rounds(),
@@ -341,25 +408,32 @@ mod tests {
     }
 
     #[test]
-    pub fn new_crypto() {
-        let crypto: Crypto<Pbkdf2Params> = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
-        assert_ne!("", crypto.ciphertext);
-        assert_ne!("", crypto.cipher);
-        assert_ne!("", crypto.mac);
-        assert_ne!("", crypto.cipherparams.iv);
-        assert_ne!("", crypto.kdfparams.salt);
-        assert_eq!("pbkdf2", crypto.kdf)
+    fn test_new_crypto() {
+        let crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+        assert_ne!(crypto.ciphertext, "");
+        assert_ne!(crypto.cipher, "");
+        assert_ne!(crypto.mac, "");
+        assert_ne!(crypto.cipherparams.iv, "");
+        match &crypto.kdf {
+            KdfType::Pbkdf2(params) => {
+                assert_ne!(params.salt, "")
+            }
+            _ => panic!("kdf type must be pbkdf2"),
+        }
+        assert_eq!("pbkdf2", crypto.kdf.name());
     }
 
     #[test]
-    pub fn decrypt_crypto() {
-        let crypto: Crypto<Pbkdf2Params> = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+    fn test_decrypt_crypto() {
+        let crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
         let cipher_bytes = crypto
-            .decrypt(Key::Password(TEST_PASSWORD.to_owned()))
-            .expect("cipher bytes");
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .plaintext()
+            .unwrap();
         assert_eq!("TokenCoreX", String::from_utf8(cipher_bytes).unwrap());
 
-        let ret = crypto.decrypt(Key::Password("WrongPassword".to_owned()));
+        let ret = crypto.use_key(&Key::Password("WrongPassword".to_owned()));
         assert!(ret.is_err());
         let err = ret.err().unwrap();
         assert_eq!(
@@ -369,31 +443,73 @@ mod tests {
     }
 
     #[test]
-    pub fn enc_pair_test() {
-        let crypto: Crypto<Pbkdf2Params> = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+    fn test_kdf_type() {
+        let mut params = Pbkdf2Params::default();
+        params.salt = random_u8_32().to_hex();
+
+        let kdf_type = KdfType::Pbkdf2(params);
+        assert!(kdf_type.validate().is_ok());
+        assert_eq!(kdf_type.name(), "pbkdf2");
+
+        let mut params = SCryptParams::default();
+        params.salt = random_u8_32().to_hex();
+
+        let kdf_type = KdfType::Scrypt(params);
+        assert!(kdf_type.validate().is_ok());
+        assert_eq!(kdf_type.name(), "scrypt");
+
+        let kdf_type = KdfType::default();
+        assert_eq!(kdf_type.name(), "pbkdf2");
+    }
+
+    #[test]
+    fn test_verify_password() {
+        let crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+        assert!(crypto.verify_password(TEST_PASSWORD));
+        assert!(!crypto.verify_password("WrongPassword"));
+    }
+
+    #[test]
+    fn test_dangerous_rewrite_plaintext() {
+        let mut crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+        let derived_key = crypto
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .derived_key()
+            .to_vec();
+        crypto
+            .dangerous_rewrite_plaintext(&derived_key, "TokenCoreX".as_bytes())
+            .unwrap();
+        let cipher_bytes = crypto
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .plaintext()
+            .unwrap();
+        assert_eq!("TokenCoreX", String::from_utf8(cipher_bytes).unwrap());
+    }
+
+    #[test]
+    fn test_enc_pair() {
+        let crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
         let enc_pair = crypto
-            .derive_enc_pair(TEST_PASSWORD, "TokenCoreX".as_bytes())
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .encrypt_with_random_iv("TokenCoreX".as_bytes())
             .unwrap();
 
         assert_ne!("", enc_pair.nonce);
         assert_ne!("", enc_pair.enc_str);
 
         let decrypted_bytes = crypto
-            .decrypt_enc_pair(Key::Password(TEST_PASSWORD.to_owned()), &enc_pair)
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .decrypt_enc_pair(&enc_pair)
             .unwrap();
         let decrypted = String::from_utf8(decrypted_bytes).unwrap();
 
         assert_eq!("TokenCoreX", decrypted);
 
-        let ret = crypto.decrypt_enc_pair(Key::Password("WrongPassword".to_owned()), &enc_pair);
-        assert!(ret.is_err());
-        let err = ret.err().unwrap();
-        assert_eq!(
-            Error::PasswordIncorrect,
-            err.downcast::<crate::Error>().unwrap()
-        );
-
-        let ret = crypto.derive_enc_pair("WrongPassword", &hex::decode("01020304").unwrap());
+        let ret = crypto.use_key(&Key::Password("WrongPassword".to_owned()));
         assert!(ret.is_err());
         let err = ret.err().unwrap();
         assert_eq!(
@@ -403,22 +519,23 @@ mod tests {
     }
 
     #[test]
-    pub fn kdfparams_trait_validate_test() {
+    fn test_kdfparams_trait_validate() {
         let err = Pbkdf2Params::default().validate().err().unwrap();
         assert_eq!(
+            err.downcast::<crate::Error>().unwrap(),
             Error::KdfParamsInvalid,
-            err.downcast::<crate::Error>().unwrap()
         );
 
         let mut params = Pbkdf2Params::default();
-        params.set_salt("0x1234");
+        params.salt = "0x1234".to_owned();
 
         assert!(params.validate().is_ok());
+        assert_eq!(params.name(), "pbkdf2");
 
         let err = SCryptParams::default().validate().err().unwrap();
         assert_eq!(
-            Error::KdfParamsInvalid,
-            err.downcast::<crate::Error>().unwrap()
+            err.downcast::<crate::Error>().unwrap(),
+            Error::KdfParamsInvalid
         );
 
         assert_eq!(*crate::KDF_ROUNDS.read() as u32, 262144);
@@ -435,29 +552,38 @@ mod tests {
     }
 
     #[test]
-    pub fn generate_derived_key_pbkdf2_test() {
+    fn test_derive_key_pbkdf2() {
         let mut pbkdf2_param = Pbkdf2Params::default();
         pbkdf2_param.c = 1024;
         pbkdf2_param.salt = "01020304010203040102030401020304".to_string();
         let mut derived_key = [0; CREDENTIAL_LEN];
-        pbkdf2_param.generate_derived_key(TEST_PASSWORD.as_bytes(), &mut derived_key);
+        pbkdf2_param.derive_key(TEST_PASSWORD.as_bytes(), &mut derived_key);
         let dk_hex = derived_key.to_hex();
         assert_eq!("515c00df30d4eb0e5662030ccea231301ce44d685eb29aca04469f4d6b701898e75e51080a482dd46c04cf39308e7d228a0f70a45d7fa17cd4027d04c39f5e17", dk_hex);
+
+        assert!(pbkdf2_param.validate().is_ok());
+        pbkdf2_param.c = 0;
+        assert!(pbkdf2_param.validate().is_err());
     }
 
     #[test]
-    pub fn generate_derived_key_scrypt_test() {
+    fn test_derive_key_scrypt() {
         let mut param = SCryptParams::default();
         param.n = 1024;
         param.salt = "01020304010203040102030401020304".to_string();
         let mut derived_key = [0; CREDENTIAL_LEN];
-        param.generate_derived_key(TEST_PASSWORD.as_bytes(), &mut derived_key);
+        param.derive_key(TEST_PASSWORD.as_bytes(), &mut derived_key);
         let dk_hex = derived_key.to_hex();
         assert_eq!("190fba2c4dcd250b67652b6ea401a286ba4afff692aa9700ce56edd5326cb23b05c9af493f8d3dccb8191437f8cb5d2c3ba718af64aee8a7f318eedf2af5eb3f", dk_hex);
+        assert_eq!("scrypt", param.name());
+
+        assert!(param.validate().is_ok());
+        param.n = 0;
+        assert!(param.validate().is_err());
     }
 
     #[test]
-    pub fn decode_v3_keystore_crypto_test() {
+    fn test_decode_v3_keystore_crypto() {
         let data = r#"{
     "mac": "a10b412993ec783e854cb339b1f4165a013d41267adb561ed9ab47c209dea3ab",
     "cipherparams": {
@@ -475,34 +601,56 @@ mod tests {
     "kdf": "scrypt"
   }"#;
 
-        let crypto: Crypto<SCryptParams> = serde_json::from_str(data).unwrap();
+        let crypto: Crypto = serde_json::from_str(data).unwrap();
         let result = crypto
-            .decrypt(Key::Password("Insecure Pa55w0rd".to_owned()))
+            .use_key(&Key::Password("Insecure Pa55w0rd".to_owned()))
+            .unwrap()
+            .plaintext()
             .unwrap();
         let wif = String::from_utf8(result).unwrap();
         assert_eq!("L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB", wif)
     }
 
     #[test]
-    pub fn deserialize_from_json() {
-        let data = r#"
-    {
-    "cipher": "aes-128-ctr",
-    "cipherparams": {
-      "iv": "2cb9d4457b284e47877d08a5c9493b46"
-    },
-    "ciphertext": "17ff4858e697455f4966c6072473f3501534bc20deb339b58aeb8db0bd9fe91777148d0a909f679fb6e3a7a64609034afeb72a",
-    "kdf": "pbkdf2",
-    "kdfparams": {
-      "c": 10240,
-      "dklen": 32,
-      "prf": "hmac-sha256",
-      "salt": "37890eb305866aa07853d14e7666c2ed31e18efc1129f1c5a66b9cc93d03fd73"
-    },
-    "mac": "4906577f075ad714f328e7b33829fdccfa8cd22eab2c0a8bc4f577824188ed16"
-  }"#;
+    fn test_use_derive_key() {
+        let crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+        let derived_key = crypto
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .derived_key()
+            .to_hex();
+
+        let u = crypto.use_key(&Key::DerivedKey(derived_key)).unwrap();
+        assert_eq!(
+            "TokenCoreX",
+            String::from_utf8(u.plaintext().unwrap()).unwrap()
+        );
+    }
+
+    #[test]
+    fn test_use_wrong_derived_key() {
+        let crypto: Crypto = Crypto::new(TEST_PASSWORD, "TokenCoreX".as_bytes());
+        let wrong_derive_key = random_u8_64().to_hex();
+        let u = crypto.use_key(&Key::DerivedKey(wrong_derive_key));
+        assert!(u.is_err());
+    }
 
-        let crypto: Crypto<Pbkdf2Params> = serde_json::from_str(data).unwrap();
+    #[test]
+    fn test_deserialize_crypto_with_kdf_type_from_json() {
+        let data = sample_json_str();
+        let crypto: Crypto = serde_json::from_str(data).unwrap();
+
+        assert_eq!(
+            crypto.mac,
+            "4906577f075ad714f328e7b33829fdccfa8cd22eab2c0a8bc4f577824188ed16"
+        );
+        assert_eq!(crypto.ciphertext, "17ff4858e697455f4966c6072473f3501534bc20deb339b58aeb8db0bd9fe91777148d0a909f679fb6e3a7a64609034afeb72a");
+    }
+
+    #[test]
+    fn test_deserialize_from_json() {
+        let data = sample_json_str();
+        let crypto: Crypto = serde_json::from_str(data).unwrap();
 
         assert_eq!(
             crypto.mac,
diff --git a/token-core/tcx-crypto/src/hash.rs b/token-core/tcx-crypto/src/hash.rs
deleted file mode 100644
index e862d211..00000000
--- a/token-core/tcx-crypto/src/hash.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use digest::Digest;
-use sha2::Sha256;
-
-pub fn dsha256(bytes: &[u8]) -> Vec<u8> {
-    Sha256::digest(&Sha256::digest(&bytes)).to_vec()
-}
-
-pub fn hex_dsha256(hex: &str) -> String {
-    let key_data: Vec<u8> = hex::decode(hex).expect("hex can't decode");
-    hex::encode(dsha256(&key_data))
-}
-
-pub fn str_dsha256(str: &str) -> String {
-    let key_data = str.as_bytes();
-    hex::encode(dsha256(&key_data))
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::hash::{dsha256, hex_dsha256, str_dsha256};
-
-    #[test]
-    fn sha256_test() {
-        assert_eq!(
-            hex::encode(dsha256(vec![0x1, 0x2, 0x3, 0x4].as_slice())),
-            "8de472e2399610baaa7f84840547cd409434e31f5d3bd71e4d947f283874f9c0"
-        );
-        assert_eq!(
-            hex_dsha256("01020304"),
-            "8de472e2399610baaa7f84840547cd409434e31f5d3bd71e4d947f283874f9c0"
-        );
-        assert_eq!(
-            str_dsha256("01020304"),
-            "26a0f059b048e922a223ff432ce9c87b13df2f25adc8e876a79a15326519fd76"
-        );
-    }
-}
diff --git a/token-core/tcx-crypto/src/lib.rs b/token-core/tcx-crypto/src/lib.rs
index b6832439..b2543372 100644
--- a/token-core/tcx-crypto/src/lib.rs
+++ b/token-core/tcx-crypto/src/lib.rs
@@ -1,32 +1,30 @@
 pub mod aes;
 pub mod crypto;
-pub mod hash;
-pub mod numberic_util;
 
 use core::result;
-pub use crypto::{Crypto, EncPair, Key, Pbkdf2Params};
+pub use crypto::{Crypto, EncPair, KdfParams, Key, Pbkdf2Params, SCryptParams};
 use parking_lot::RwLock;
 
-#[macro_use]
-extern crate failure;
 #[macro_use]
 extern crate lazy_static;
 
-pub type Result<T> = result::Result<T, failure::Error>;
+pub type Result<T> = result::Result<T, anyhow::Error>;
+
+use thiserror::Error;
 
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum Error {
-    #[fail(display = "kdf_params_invalid")]
+    #[error("kdf_params_invalid")]
     KdfParamsInvalid,
-    #[fail(display = "password_incorrect")]
+    #[error("password_incorrect")]
     PasswordIncorrect,
-    #[fail(display = "derived_key_not_matched")]
+    #[error("derived_key_not_matched")]
     DerivedKeyNotMatched,
-    #[fail(display = "invalid_key_iv_length")]
+    #[error("invalid_key_iv_length")]
     InvalidKeyIvLength,
-    #[fail(display = "invalid_ciphertext")]
+    #[error("invalid_ciphertext")]
     InvalidCiphertext,
-    #[fail(display = "cached_dk_feature_not_support")]
+    #[error("cached_dk_feature_not_support")]
     CachedDkFeatureNotSupport,
 }
 
diff --git a/token-core/tcx-crypto/src/numberic_util.rs b/token-core/tcx-crypto/src/numberic_util.rs
deleted file mode 100644
index 2f61089b..00000000
--- a/token-core/tcx-crypto/src/numberic_util.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use rand::{thread_rng, RngCore};
-use std::vec;
-
-pub fn random_iv(len: usize) -> Vec<u8> {
-    let mut v = vec![0u8; len];
-    thread_rng().fill_bytes(&mut v);
-    v
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::numberic_util::random_iv;
-
-    #[test]
-    fn it_works() {
-        let ret = random_iv(32);
-        assert_eq!(32, ret.len());
-
-        let ret = random_iv(64);
-        assert_eq!(64, ret.len());
-    }
-}
diff --git a/token-core/tcx-docs/TECH.zh.md b/token-core/tcx-docs/TECH.zh.md
index b4fd6870..a113b81a 100644
--- a/token-core/tcx-docs/TECH.zh.md
+++ b/token-core/tcx-docs/TECH.zh.md
@@ -240,7 +240,7 @@ fn _import_wallet_from_mnemonic(v: &Value) -> Result<String> {
 ```rust
 fn _sign_transaction(json_str: &str) -> Result<String> {
     let v: Value = serde_json::from_str(json_str).unwrap();
-    // parse arguments and get keystore
+    // parse arguments and get fixtures
     match chain_type {
         "BITCOINCASH" | "LITECOIN" | "LITECOIN-TESTNET" => _sign_btc_fork_transaction(json_str, keystore, password),
         _ => Err(format_err!("{}", "chain_type_not_support")),
@@ -291,8 +291,8 @@ fn _sign_btc_fork_transaction(json: &str, keystore: &HdKeystore, password: &str)
 ## 新链接入（简略版）
 1. 添加一个新的package，命名为`tcx-blockchain`其中的blockchain用链的名称替换，将如下代码写入该package里面   
 2. 定义CoinInfo, CoinInfo可以指定你要添加的链的名称，所在的曲线以及助记词的派生路径。    
-3. 可选）如果你所添加的链包含有特殊的需要保存的信息，你需要实现你自己的`tcx_chain::Extra`。该接口用于根据`CoinInfo`和`Seed`生成特定信息，最终该信息会被序列化成JSON数据存储在account中的extra字段内。     
-4. 实现tcx_chain::Address，添加你所在的链的地址推导方法，分别添加判断地址是否有效，根据pub_key生成地址    
-5. 实现tcx_chain::Transaction，添加你签名是需要输入的字段， 实现tcx_chain::SignedTransaction，添加你签名结束后的输出内容。如果的的签名结果比较简单，你可以使用tcx默认提供的TxSignResult结构。   
-6. 实现tcx_chain::TransactionSigner，添加你所在的链特定的签名算法    
+3. 可选）如果你所添加的链包含有特殊的需要保存的信息，你需要实现你自己的`tcx_keystore::Extra`。该接口用于根据`CoinInfo`和`Seed`生成特定信息，最终该信息会被序列化成JSON数据存储在account中的extra字段内。     
+4. 实现tcx_keystore::Address，添加你所在的链的地址推导方法，分别添加判断地址是否有效，根据pub_key生成地址    
+5. 实现tcx_keystore::Transaction，添加你签名是需要输入的字段， 实现tcx_keystore::SignedTransaction，添加你签名结束后的输出内容。如果的的签名结果比较简单，你可以使用tcx默认提供的TxSignResult结构。   
+6. 实现tcx_keystore::TransactionSigner，添加你所在的链特定的签名算法    
 7. 在tcx层添加match pattern 指向正确的处理逻辑    
diff --git a/token-core/tcx-eos/Cargo.toml b/token-core/tcx-eos/Cargo.toml
new file mode 100644
index 00000000..06f99d97
--- /dev/null
+++ b/token-core/tcx-eos/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "tcx-eos"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tcx-crypto = { path = "../tcx-crypto" }
+tcx-keystore = { path = "../tcx-keystore" }
+tcx-primitive = { path = "../tcx-primitive" }
+tcx-constants = { path = "../tcx-constants" }
+tcx-common = {path = "../tcx-common"}
+
+anyhow = { version = "=1.0.79", features = [] }
+regex = "=1.9.3"
+bitcoin = "=0.29.2"
+
+prost = "=0.11.2"
+bytes = "=1.4.0"
+base64 = "=0.13.1"
diff --git a/token-core/tcx-eos/src/address.rs b/token-core/tcx-eos/src/address.rs
new file mode 100644
index 00000000..cae9b81d
--- /dev/null
+++ b/token-core/tcx-eos/src/address.rs
@@ -0,0 +1,117 @@
+use bitcoin::util::base58;
+use std::str::FromStr;
+use tcx_common::ripemd160;
+use tcx_constants::CoinInfo;
+use tcx_keystore::{keystore::PublicKeyEncoder, Address, Result};
+use tcx_primitive::TypedPublicKey;
+
+#[derive(PartialEq, Eq, Clone)]
+pub struct EosAddress {}
+
+#[derive(PartialEq, Eq, Clone)]
+pub struct EosPublicKeyEncoder {}
+
+impl PublicKeyEncoder for EosPublicKeyEncoder {
+    fn encode(public_key: &TypedPublicKey, _coin_info: &CoinInfo) -> Result<String> {
+        let pubkey_bytes = public_key.to_bytes();
+        let hashed_bytes = ripemd160(&pubkey_bytes);
+        let checksum = hashed_bytes[..4].to_vec();
+        let mut bytes = vec![];
+        bytes.extend_from_slice(&pubkey_bytes);
+        bytes.extend_from_slice(&checksum);
+        Ok(format!("EOS{}", base58::encode_slice(&bytes)))
+    }
+}
+
+impl Address for EosAddress {
+    fn from_public_key(_public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<Self> {
+        Ok(EosAddress {})
+    }
+
+    fn is_valid(address: &str, _coin: &CoinInfo) -> bool {
+        let r = EosAddress::from_str(address);
+        r.is_ok()
+    }
+}
+
+impl FromStr for EosAddress {
+    type Err = anyhow::Error;
+    fn from_str(_s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(EosAddress {})
+    }
+}
+
+impl ToString for EosAddress {
+    fn to_string(&self) -> String {
+        "".to_string()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use crate::address::EosPublicKeyEncoder;
+    use tcx_common::FromHex;
+    use tcx_constants::{CoinInfo, CurveType};
+    use tcx_keystore::PublicKeyEncoder;
+    use tcx_primitive::{PublicKey, Secp256k1PublicKey, TypedPrivateKey, TypedPublicKey};
+
+    #[test]
+    fn test_encode_public_key() {
+        let tests = [
+            (
+                "0x037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5",
+                "EOS7mYcbf9BumHjUUCPoXh2nxzkipQZDQCZC7EmRq8cwB1exEYHfy",
+            ),
+            (
+                "0x03f6a261f3b4d7c24014f2026b09ad409076c566b39b99b8e0a7196f391caec508",
+                "EOS8hrUMSKjQZK4QsXLfAVTwmmD4nTfF9Lb11ZQN3zVYrdxhApgFr",
+            ),
+            (
+                "0x03844a01522a26156df32b587d80df60d76072480e299c6d3241c7b2b929c07625",
+                "EOS7qVgE5PF58jAV7HmFPNEAEdyZmE4UBasTRa7AZ1AhJGxYovBwc",
+            ),
+            (
+                "0x035cda3171ba9107ec3f398c8e33b17803fd9d6a815ee5d544a71759455396319c",
+                "EOS7Y8KPZQDMhDWjHaM3nWRWwYSoP75KpSatFbanKRPRaUKDWi2UA",
+            ),
+        ];
+
+        for i in tests {
+            let bytes = Vec::from_0x_hex(i.0).unwrap();
+            let k1_pub_key = Secp256k1PublicKey::from_slice(&bytes).unwrap();
+            let typed_pub_key = TypedPublicKey::Secp256k1(k1_pub_key);
+            assert_eq!(
+                EosPublicKeyEncoder::encode(&typed_pub_key, &CoinInfo::default()).unwrap(),
+                i.1
+            );
+        }
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let tests = [
+            (
+                "0x8e14ef506fee5e0aaa32f03a45242d32d0eb993ffe25ce77542ef07219db667c",
+                "EOS6TFKUKVvtvjRq9T4fV9pdxNUuJke92nyb4rzSFtZfdR5ssmVuY",
+            ),
+            (
+                "0xe2bfd815c5923f404388a3257aa5527f0f52e92ce364e1e26a04d270c901edda",
+                "EOS5YtaCcbPJ3BknNBTDezE9eJoGNnAVuUwT8bnxhSRS5dqRvyfxr",
+            ),
+        ];
+
+        for i in tests {
+            let bytes = Vec::from_0x_hex(i.0).unwrap();
+            // let k1_pub_key = Secp256k1PublicKey::from_slice(&bytes).unwrap();
+            // let typed_pub_key = TypedPublicKey::Secp256k1(k1_pub_key);
+            let typed_pub_key = TypedPrivateKey::from_slice(CurveType::SECP256k1, &bytes)
+                .unwrap()
+                .public_key();
+            assert_eq!(
+                EosPublicKeyEncoder::encode(&typed_pub_key, &CoinInfo::default()).unwrap(),
+                i.1
+            );
+        }
+    }
+}
diff --git a/token-core/tcx-eos/src/lib.rs b/token-core/tcx-eos/src/lib.rs
new file mode 100644
index 00000000..95f3a681
--- /dev/null
+++ b/token-core/tcx-eos/src/lib.rs
@@ -0,0 +1,28 @@
+pub mod address;
+// pub mod chain_factory;
+pub mod signer;
+pub mod transaction;
+use bitcoin::util::base58;
+use tcx_common::Result;
+
+pub mod eos {
+
+    pub const CHAINS: [&str; 1] = ["EOS"];
+
+    pub type Address = crate::address::EosAddress;
+    pub type TransactionInput = crate::transaction::EosTxInput;
+    pub type TransactionOutput = crate::transaction::EosTxOutput;
+
+    pub type MessageInput = crate::transaction::EosMessageInput;
+
+    pub type MessageOutput = crate::transaction::EosMessageOutput;
+    pub type PubKeyEncoder = crate::address::EosPublicKeyEncoder;
+}
+
+pub fn encode_eos_wif(private_key_bytes: &[u8]) -> Result<String> {
+    let mut ret = [0; 33];
+    ret[0..1].copy_from_slice(&[0x80]);
+    ret[1..33].copy_from_slice(private_key_bytes);
+
+    Ok(base58::check_encode_slice(&ret[..]))
+}
diff --git a/token-core/tcx-eos/src/signer.rs b/token-core/tcx-eos/src/signer.rs
new file mode 100644
index 00000000..e3396611
--- /dev/null
+++ b/token-core/tcx-eos/src/signer.rs
@@ -0,0 +1,235 @@
+use std::vec;
+
+use crate::transaction::{EosMessageInput, EosMessageOutput, EosTxInput, EosTxOutput, SigData};
+use tcx_keystore::{
+    tcx_ensure, Keystore, MessageSigner, Result, SignatureParameters, Signer, TransactionSigner,
+};
+
+use anyhow::anyhow;
+use bitcoin::util::base58;
+use tcx_common::{ripemd160, sha256, FromHex, ToHex};
+
+fn serial_eos_sig(sig: &[u8]) -> String {
+    let to_hash = [sig, "K1".as_bytes()].concat();
+    let hashed = ripemd160(&to_hash);
+    let data = [sig, &hashed[0..4]].concat();
+    format!("SIG_K1_{}", base58::encode_slice(&data))
+}
+
+fn is_canonical(sig: &[u8]) -> bool {
+    !(sig[0] & 0x80 != 0)
+        && !(sig[0] == 0 && !(sig[1] & 0x80 != 0))
+        && !(sig[32] & 0x80 != 0)
+        && !(sig[32] == 0 && !(sig[33] & 0x80 != 0))
+}
+
+fn i32_to_u8_array(value: i32) -> [u8; 32] {
+    let bytes = value.to_be_bytes();
+    let mut result = [0u8; 32];
+    result[..4].copy_from_slice(&bytes);
+    result
+}
+
+fn eos_sign(keystore: &mut Keystore, hashed: &[u8], path: &str) -> Result<String> {
+    let mut sign_result: Vec<u8> = vec![];
+    let mut is_canon = false;
+    for nonce in 0..1000 {
+        sign_result = keystore.secp256k1_ecdsa_sign_recoverable_with_noncedata(
+            hashed,
+            &path,
+            &i32_to_u8_array(nonce),
+        )?;
+        if is_canonical(&sign_result) {
+            is_canon = true;
+            break;
+        }
+    }
+    tcx_ensure!(is_canon, anyhow!("cannot generate a eos canon sig"));
+    sign_result[64] += 27 + 4;
+    let sig = [sign_result[64..].to_vec(), sign_result[..64].to_vec()].concat();
+    Ok(serial_eos_sig(&sig))
+}
+
+impl TransactionSigner<EosTxInput, EosTxOutput> for Keystore {
+    fn sign_transaction(
+        &mut self,
+        params: &SignatureParameters,
+        tx: &EosTxInput,
+    ) -> Result<EosTxOutput> {
+        let chain_id_bytes = Vec::from_hex_auto(&tx.chain_id)?;
+        let zero_padding = [0u8; 32];
+        let mut eos_sigs = vec![];
+        for tx_hex in &tx.tx_hexs {
+            let tx_bytes = Vec::from_hex_auto(tx_hex)?;
+            let tx_hash = sha256(&tx_bytes);
+            let tx_with_chain_id = [
+                chain_id_bytes.as_slice(),
+                tx_bytes.as_slice(),
+                &zero_padding,
+            ]
+            .concat();
+            let hashed_tx = sha256(&tx_with_chain_id);
+            let eos_sig = eos_sign(self, &hashed_tx, &params.derivation_path)?;
+            // EOS need v r s
+
+            eos_sigs.push(SigData {
+                signature: eos_sig,
+                hash: tx_hash.to_0x_hex(),
+            });
+        }
+        Ok(EosTxOutput { sig_data: eos_sigs })
+    }
+}
+
+impl MessageSigner<EosMessageInput, EosMessageOutput> for Keystore {
+    fn sign_message(
+        &mut self,
+        params: &SignatureParameters,
+        message: &EosMessageInput,
+    ) -> Result<EosMessageOutput> {
+        let data_hashed = if message.data.starts_with("0x") {
+            Vec::from_hex_auto(&message.data)?
+        } else {
+            let bytes = message.data.as_bytes();
+            sha256(bytes).to_vec()
+        };
+
+        tcx_ensure!(
+            data_hashed.len() == 32,
+            anyhow!("{}", "hashed data must be 32 bytes")
+        );
+
+        let eos_sig = eos_sign(self, &data_hashed, &params.derivation_path)?;
+        Ok(EosMessageOutput { signature: eos_sig })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::vec;
+
+    use bitcoin::hashes::hex::ToHex;
+    use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_keystore::{
+        HdKeystore, Keystore, MessageSigner, Metadata, PrivateKeystore, SignatureParameters,
+        TransactionSigner,
+    };
+    use tcx_primitive::{PrivateKey, Secp256k1PrivateKey};
+
+    use crate::transaction::{EosMessageInput, EosTxInput};
+
+    #[test]
+    fn test_eos_sign_tx() {
+        let meta = Metadata::default();
+
+        let hd_keystore = HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, meta).unwrap();
+        let mut keystore = Keystore::Hd(hd_keystore);
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        let sign_param = SignatureParameters {
+            chain_type: "EOS".to_string(),
+            derivation_path: "m/44'/194'/0'/0/0".to_string(),
+            ..SignatureParameters::default()
+        };
+        let tx_input = EosTxInput {
+            chain_id: "aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906".to_string(),
+            tx_hexs: vec!["2b03b26547b625edc1c6000000000100a6823403ea3055000000572d3ccdcd0130069b34b2a9a48b00000000a8ed32322130069b34b2a9a48b10425e79aa47b374640000000000000004454f53000000000000".to_string(),
+            "8c05b2650abbf70ba628000000000100a6823403ea3055000000572d3ccdcd0130069b34b2a9a48b00000000a8ed32322130069b34b2a9a48b10425e79aa47b374e80300000000000004454f53000000000000".to_string(),
+            "5a09b265a5c205ed6bea000000000100a6823403ea3055000000572d3ccdcd0110425e79aa47b37400000000a8ed32322110425e79aa47b37430069b34b2a9a48b640000000000000004454f53000000000000".to_string(),
+            "db0bb265a7c74d49719c000000000100a6823403ea3055000000572d3ccdcd0110425e79aa47b37400000000a8ed32322110425e79aa47b37430069b34b2a9a48be80300000000000004454f53000000000000".to_string(),
+            "c578065b93aec6a7c811000000000100a6823403ea3055000000572d3ccdcd01000000602a48b37400000000a8ed323225000000602a48b374208410425c95b1ca80969800000000000453595300000000046d656d6f00".to_string()]
+
+        };
+        let ret = keystore.sign_transaction(&sign_param, &tx_input).unwrap();
+        assert_eq!(ret.sig_data[0].signature, "SIG_K1_KYgqnbZkL57TAJtgZ4ntrCxQ38B313WWpZEDyGwA7s4sjmyHissY6WAeCdyYHukBWp2QsqEH8hdtQLchR2LZSzMhvvHmCm");
+        assert_eq!(
+            ret.sig_data[0].hash,
+            "0x0461387aa99644399b1c8c876805fc775f96e6a00ce18ffbe4eaa930ad6e7af8"
+        );
+        assert_eq!(ret.sig_data[1].signature, "SIG_K1_Jy7PBEwCpvvf5k4yzrqq1KeBCZi5qru7mp3CspNw8n8xENpN8Ar6s3ckuEeH66Rd9QFbUZzrD4pAemkBEWMyBM7PBdDR4t");
+        assert_eq!(
+            ret.sig_data[1].hash,
+            "0xe36d9a49ca7768198a092c5b3f9b9766343ff14eb1fde851bed9cbda2ef1ab58"
+        );
+        assert_eq!(ret.sig_data[2].signature, "SIG_K1_K1iY4LUoLwnYVFMaWZddr74NSmLcCBDEysybA7oTLMn7dYtFdeHpy8oSv4rEdGYoa8rzsE17QaPJikSyjDY4t3EeK2m1ir");
+        assert_eq!(ret.sig_data[3].signature, "SIG_K1_Ki7M5TB9Di3i2orD1ntym5xmhh5rAeJPK8XxNfAUjeNc3SQyMA9UZ37ptfTLjngb9cfhdBG3j2DQXrderrXH59t5DcHwgT");
+        assert_eq!(ret.sig_data[4].signature, "SIG_K1_K7EUD2iuUi4QFgTNuondGqjaWJ4AWzp1EMhqKg4t1oGoSKhjvTpfqv6EcD6M2R8qQvJjf7f2mV8zHEXHgLKH985DU1JPyf");
+    }
+
+    #[test]
+    fn test_pk_store_eos_sign_msg() {
+        let meta = Metadata::default();
+
+        let hex_sec_key =
+            Secp256k1PrivateKey::from_wif("5KAigHMamRhN7uwHFnk3yz7vUTyQT1nmXoAA899XpZKJpkqsPFp")
+                .unwrap()
+                .to_bytes()
+                .to_hex();
+        let pk_keystore = PrivateKeystore::from_private_key(
+            &hex_sec_key,
+            TEST_PASSWORD,
+            tcx_constants::CurveType::SECP256k1,
+            meta,
+            None,
+        )
+        .unwrap();
+        let mut keystore = Keystore::PrivateKey(pk_keystore);
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        let sign_param = SignatureParameters {
+            chain_type: "EOS".to_string(),
+            ..SignatureParameters::default()
+        };
+        let tx_input = EosTxInput {
+            chain_id: "aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906".to_string(),
+            tx_hexs: vec!["2b03b26547b625edc1c6000000000100a6823403ea3055000000572d3ccdcd0130069b34b2a9a48b00000000a8ed32322130069b34b2a9a48b10425e79aa47b374640000000000000004454f53000000000000".to_string(),
+            "8c05b2650abbf70ba628000000000100a6823403ea3055000000572d3ccdcd0130069b34b2a9a48b00000000a8ed32322130069b34b2a9a48b10425e79aa47b374e80300000000000004454f53000000000000".to_string(),
+            "5a09b265a5c205ed6bea000000000100a6823403ea3055000000572d3ccdcd0110425e79aa47b37400000000a8ed32322110425e79aa47b37430069b34b2a9a48b640000000000000004454f53000000000000".to_string(),
+            "db0bb265a7c74d49719c000000000100a6823403ea3055000000572d3ccdcd0110425e79aa47b37400000000a8ed32322110425e79aa47b37430069b34b2a9a48be80300000000000004454f53000000000000".to_string(),
+            "c578065b93aec6a7c811000000000100a6823403ea3055000000572d3ccdcd01000000602a48b37400000000a8ed323225000000602a48b374208410425c95b1ca80969800000000000453595300000000046d656d6f00".to_string()]
+
+        };
+        let ret = keystore.sign_transaction(&sign_param, &tx_input).unwrap();
+        assert_eq!(ret.sig_data[0].signature, "SIG_K1_KYgqnbZkL57TAJtgZ4ntrCxQ38B313WWpZEDyGwA7s4sjmyHissY6WAeCdyYHukBWp2QsqEH8hdtQLchR2LZSzMhvvHmCm");
+        assert_eq!(
+            ret.sig_data[0].hash,
+            "0x0461387aa99644399b1c8c876805fc775f96e6a00ce18ffbe4eaa930ad6e7af8"
+        );
+        assert_eq!(ret.sig_data[1].signature, "SIG_K1_Jy7PBEwCpvvf5k4yzrqq1KeBCZi5qru7mp3CspNw8n8xENpN8Ar6s3ckuEeH66Rd9QFbUZzrD4pAemkBEWMyBM7PBdDR4t");
+        assert_eq!(
+            ret.sig_data[1].hash,
+            "0xe36d9a49ca7768198a092c5b3f9b9766343ff14eb1fde851bed9cbda2ef1ab58"
+        );
+        assert_eq!(ret.sig_data[2].signature, "SIG_K1_K1iY4LUoLwnYVFMaWZddr74NSmLcCBDEysybA7oTLMn7dYtFdeHpy8oSv4rEdGYoa8rzsE17QaPJikSyjDY4t3EeK2m1ir");
+        assert_eq!(ret.sig_data[3].signature, "SIG_K1_Ki7M5TB9Di3i2orD1ntym5xmhh5rAeJPK8XxNfAUjeNc3SQyMA9UZ37ptfTLjngb9cfhdBG3j2DQXrderrXH59t5DcHwgT");
+        assert_eq!(ret.sig_data[4].signature, "SIG_K1_K7EUD2iuUi4QFgTNuondGqjaWJ4AWzp1EMhqKg4t1oGoSKhjvTpfqv6EcD6M2R8qQvJjf7f2mV8zHEXHgLKH985DU1JPyf");
+    }
+
+    #[test]
+    fn test_eos_sign_msg() {
+        let meta = Metadata::default();
+
+        let hex_sec_key =
+            Secp256k1PrivateKey::from_wif("5HxQKWDznancXZXm7Gr2guadK7BhK9Zs8ejDhfA9oEBM89ZaAru")
+                .unwrap()
+                .to_bytes()
+                .to_hex();
+        let pk_keystore = PrivateKeystore::from_private_key(
+            &hex_sec_key,
+            TEST_PASSWORD,
+            tcx_constants::CurveType::SECP256k1,
+            meta,
+            None,
+        )
+        .unwrap();
+        let mut keystore = Keystore::PrivateKey(pk_keystore);
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        let sign_param = SignatureParameters {
+            chain_type: "EOS".to_string(),
+            ..SignatureParameters::default()
+        };
+        let tx_input = EosMessageInput {
+            data: "0x6cb75bc5a46a7fdb64b92efefca01ed7b060ab5e0d625226e8efbc0980c3ddc1".to_string(),
+        };
+        let ret = keystore.sign_message(&sign_param, &tx_input).unwrap();
+        assert_eq!(ret.signature, "SIG_K1_KkkPJXMxGUUeS6b5FmKrXE448N1Gc4x87j4JLVuENuba5QRUmFczGe9EmzeoCajRH5YLGEGcYjWSXxxfR5b6RTCoNUdCVy");
+    }
+}
diff --git a/token-core/tcx-eos/src/transaction.rs b/token-core/tcx-eos/src/transaction.rs
new file mode 100644
index 00000000..e50964f7
--- /dev/null
+++ b/token-core/tcx-eos/src/transaction.rs
@@ -0,0 +1,40 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EosAccount {
+    #[prost(string, tag = "1")]
+    pub account_name: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EosTxInput {
+    #[prost(string, tag = "1")]
+    pub chain_id: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "2")]
+    pub tx_hexs: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SigData {
+    #[prost(string, tag = "1")]
+    pub signature: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub hash: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EosTxOutput {
+    #[prost(message, repeated, tag = "1")]
+    pub sig_data: ::prost::alloc::vec::Vec<SigData>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EosMessageInput {
+    #[prost(string, tag = "1")]
+    pub data: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EosMessageOutput {
+    #[prost(string, tag = "1")]
+    pub signature: ::prost::alloc::string::String,
+}
diff --git a/token-core/tcx-eth/Cargo.toml b/token-core/tcx-eth/Cargo.toml
new file mode 100644
index 00000000..0b8d3885
--- /dev/null
+++ b/token-core/tcx-eth/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "tcx-eth"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tcx-keystore = {path = "../tcx-keystore"}
+tcx-primitive = {path = "../tcx-primitive"}
+tcx-constants = {path = "../tcx-constants"}
+tcx-common = {path = "../tcx-common"}
+
+anyhow = { version = "=1.0.79", features = [] }
+hex = "=0.4.3"
+ethereum-types = "=0.14.0"
+rlp = "=0.5.2"
+prost = "=0.11.2"
+prost-types = "=0.11.2"
+regex = "=1.9.3"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
diff --git a/token-core/tcx-eth/src/address.rs b/token-core/tcx-eth/src/address.rs
new file mode 100644
index 00000000..852ce672
--- /dev/null
+++ b/token-core/tcx-eth/src/address.rs
@@ -0,0 +1,221 @@
+use crate::Result;
+use anyhow::anyhow;
+use ethereum_types::H160;
+use regex::Regex;
+use std::str::FromStr;
+use tcx_common::{keccak256, FromHex, ToHex};
+use tcx_constants::CoinInfo;
+use tcx_keystore::Address;
+use tcx_primitive::TypedPublicKey;
+
+#[derive(PartialEq, Eq, Clone)]
+pub struct EthAddress(H160);
+
+pub fn to_checksum(addr: &ethereum_types::Address, chain_id: Option<u8>) -> String {
+    let prefixed_addr = match chain_id {
+        Some(chain_id) => format!("{chain_id}0x{addr:x}"),
+        None => format!("{addr:x}"),
+    };
+    let hash = keccak256(prefixed_addr.as_bytes()).to_hex();
+    let hash = hash.as_bytes();
+
+    let addr_hex = addr.as_bytes().to_hex();
+    let addr_hex = addr_hex.as_bytes();
+
+    addr_hex
+        .iter()
+        .zip(hash)
+        .fold("0x".to_owned(), |mut encoded, (addr, hash)| {
+            encoded.push(if *hash >= 56 {
+                addr.to_ascii_uppercase() as char
+            } else {
+                addr.to_ascii_lowercase() as char
+            });
+            encoded
+        })
+}
+
+pub fn pubkey_to_address(compressed_pubkey: &[u8]) -> String {
+    let pubkey_hash = keccak256(compressed_pubkey[1..].as_ref());
+    let addr_bytes = pubkey_hash[12..].to_vec();
+    let addr = H160::from_slice(&addr_bytes);
+    addr.as_bytes().to_0x_hex()
+}
+
+impl Address for EthAddress {
+    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<Self> {
+        let bytes = public_key.as_secp256k1()?.to_uncompressed();
+        let pubkey_hash = keccak256(bytes[1..].as_ref());
+        let addr_bytes = pubkey_hash[12..].to_vec();
+        let addr = H160::from_slice(&addr_bytes);
+        Ok(EthAddress(addr))
+    }
+
+    fn is_valid(address: &str, _coin: &CoinInfo) -> bool {
+        is_valid_address(address)
+    }
+}
+
+impl ToString for EthAddress {
+    fn to_string(&self) -> String {
+        to_checksum(&self.0, None)
+    }
+}
+
+impl FromStr for EthAddress {
+    type Err = anyhow::Error;
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        if !is_valid_address(s) {
+            return Err(anyhow!("invalid_eth_address"));
+        }
+
+        let bytes = Vec::from_hex(&s[2..])?;
+        let addr = H160::from_slice(&bytes);
+        Ok(EthAddress(addr))
+    }
+}
+
+pub fn is_valid_address(address: &str) -> bool {
+    if address.len() != 42 || !address.starts_with("0x") {
+        return false;
+    }
+
+    let eth_addr_regex = Regex::new(r"^0x[0-9a-fA-F]{40}$").unwrap();
+    if !eth_addr_regex.is_match(address) {
+        return false;
+    }
+
+    if address.to_lowercase() == address {
+        return true;
+    }
+
+    let address = &address[2..];
+    let lower_address_bytes = address.to_lowercase();
+    let hash = keccak256(lower_address_bytes.as_bytes());
+    let hash_str = hash.to_hex();
+
+    for (i, c) in address.chars().enumerate() {
+        let char_int =
+            u8::from_str_radix(&hash_str.chars().nth(i).unwrap().to_string(), 16).unwrap();
+        if (c.is_uppercase() && char_int <= 7) || (c.is_lowercase() && char_int > 7) {
+            return false;
+        }
+    }
+
+    true
+}
+
+#[cfg(test)]
+mod test {
+    use std::str::FromStr;
+
+    use crate::address::EthAddress;
+    use tcx_common::FromHex;
+    use tcx_constants::{CoinInfo, CurveType};
+    use tcx_keystore::Address;
+    use tcx_primitive::{PrivateKey, Secp256k1PrivateKey, TypedPrivateKey};
+
+    use super::is_valid_address;
+
+    #[test]
+    fn test_eth_address() {
+        let private_key_bytes =
+            Vec::from_hex("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6")
+                .unwrap();
+        let mut secp256k1_private_key =
+            Secp256k1PrivateKey::from_slice(private_key_bytes.as_slice()).unwrap();
+        secp256k1_private_key.0.compressed = false;
+        let typed_public_key = TypedPrivateKey::Secp256k1(secp256k1_private_key).public_key();
+        let coin_info = CoinInfo {
+            coin: "ETHEREUM".to_string(),
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "testnet".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let address = EthAddress::from_public_key(&typed_public_key, &coin_info).unwrap();
+        assert_eq!(
+            address.to_string(),
+            "0xef678007D18427E6022059Dbc264f27507CD1ffC"
+        );
+
+        let is_valid =
+            EthAddress::is_valid("0xef678007d18427e6022059dbc264f27507cd1ffc", &coin_info);
+        assert_eq!(is_valid, true);
+
+        assert_eq!(
+            EthAddress::is_valid("0x95222290DD7278Aa3Ddd389Cc1E1d165CC4BAfe5", &coin_info),
+            true
+        );
+        assert_eq!(
+            EthAddress::is_valid("0x95222290DD7278Aa3Ddd389Cc1E1d165CC4BAfE5", &coin_info),
+            false
+        );
+    }
+
+    #[test]
+    fn test_eth_address_from_str() {
+        let address = EthAddress::from_str("0xef678007D18427E6022059Dbc264f27507CD1ffC").unwrap();
+        assert_eq!(
+            address.to_string(),
+            "0xef678007D18427E6022059Dbc264f27507CD1ffC"
+        );
+
+        let result = EthAddress::from_str("0xef678007D18427E6022059Dbc264f27507CD1ffCXX");
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_eth_address".to_string()
+        );
+
+        let result = EthAddress::from_str("0xef678007D18427E6022059Dbc264f27507CD1ffc");
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_eth_address".to_string()
+        );
+    }
+
+    #[test]
+    fn test_invalid_address() {
+        let invalid_address_list = vec![
+            "ef678007D18427E6022059Dbc264f27507CD1ffC",
+            "0xef678007D18427E6022059Dbc264f27507CD1ffCXX",
+            "0xef678007D18427E6022059Dbc264f27507CD1ff#",
+        ];
+        for address in invalid_address_list.iter() {
+            let result = is_valid_address(address);
+            assert_eq!(result, false);
+        }
+    }
+
+    #[test]
+    fn test_valid_address() {
+        let address_list = vec![
+            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b",
+            "0x80427Ae1f55bCf60ee4CD2db7549b8BC69a74303",
+        ];
+        for address in address_list.iter() {
+            let result = is_valid_address(address);
+            assert!(result);
+        }
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let prv_str = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let coin_info = CoinInfo {
+            coin: "ETHEREUM".to_string(),
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let address = EthAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309");
+    }
+}
diff --git a/token-core/tcx-eth/src/lib.rs b/token-core/tcx-eth/src/lib.rs
new file mode 100644
index 00000000..5b6cb94d
--- /dev/null
+++ b/token-core/tcx-eth/src/lib.rs
@@ -0,0 +1,21 @@
+pub mod address;
+pub mod signer;
+pub mod transaction_types;
+
+pub mod transaction;
+
+use core::result;
+
+pub type Result<T> = result::Result<T, anyhow::Error>;
+
+pub mod ethereum {
+    use crate::address::EthAddress;
+
+    pub const CHAINS: [&str; 1] = ["ETHEREUM"];
+
+    pub type Address = EthAddress;
+    pub type TransactionInput = crate::transaction::EthTxInput;
+    pub type TransactionOutput = crate::transaction::EthTxOutput;
+    pub type MessageInput = crate::transaction::EthMessageInput;
+    pub type MessageOutput = crate::transaction::EthMessageOutput;
+}
diff --git a/token-core/tcx-eth/src/signer.rs b/token-core/tcx-eth/src/signer.rs
new file mode 100644
index 00000000..3a975c86
--- /dev/null
+++ b/token-core/tcx-eth/src/signer.rs
@@ -0,0 +1,754 @@
+use crate::address::pubkey_to_address;
+use crate::transaction::{
+    EthMessageInput, EthMessageOutput, EthRecoverAddressInput, EthRecoverAddressOutput, EthTxInput,
+    EthTxOutput, SignatureType,
+};
+use crate::transaction_types::{Signature, Transaction, TransactionType};
+use crate::Result;
+use ethereum_types::{Address, H256};
+use std::str::FromStr;
+use tcx_common::{keccak256, parse_u256, parse_u64, utf8_or_hex_to_bytes, FromHex, Hash256, ToHex};
+use tcx_keystore::{Keystore, MessageSigner, SignatureParameters, Signer, TransactionSigner};
+
+fn hash_message<T: AsRef<[u8]>>(message: T) -> Hash256 {
+    const PREFIX: &str = "\x19Ethereum Signed Message:\n";
+
+    let message = message.as_ref();
+    let len = message.len();
+    let len_string = len.to_string();
+
+    let mut eth_message = Vec::with_capacity(PREFIX.len() + len_string.len() + len);
+    eth_message.extend_from_slice(PREFIX.as_bytes());
+    eth_message.extend_from_slice(len_string.as_bytes());
+    eth_message.extend_from_slice(message);
+
+    keccak256(&eth_message)
+}
+
+impl TransactionSigner<EthTxInput, EthTxOutput> for Keystore {
+    fn sign_transaction(
+        &mut self,
+        params: &SignatureParameters,
+        input: &EthTxInput,
+    ) -> tcx_keystore::Result<EthTxOutput> {
+        let tx: Transaction = input.try_into()?;
+
+        let signature = Signature::from_slice(
+            &self.secp256k1_ecdsa_sign_recoverable(&tx.sighash(), &params.derivation_path)?,
+        )?;
+        let signed_tx = tx.to_signed_tx(signature);
+
+        Ok(EthTxOutput {
+            signature: signed_tx.raw().to_hex(),
+            tx_hash: signed_tx.hash().to_0x_hex(),
+        })
+    }
+}
+
+impl MessageSigner<EthMessageInput, EthMessageOutput> for Keystore {
+    fn sign_message(
+        &mut self,
+        params: &SignatureParameters,
+        message: &EthMessageInput,
+    ) -> tcx_keystore::Result<EthMessageOutput> {
+        let signature = Signature::from_slice(
+            &self.secp256k1_ecdsa_sign_recoverable(&message.hash()?, &params.derivation_path)?,
+        )?;
+
+        Ok(EthMessageOutput {
+            signature: signature.to_0x_hex(),
+        })
+    }
+}
+
+impl TryFrom<&EthTxInput> for Transaction {
+    type Error = anyhow::Error;
+
+    fn try_from(tx: &EthTxInput) -> std::result::Result<Self, Self::Error> {
+        let to_addr = if tx.to.is_empty() || tx.to == "0x" {
+            "0x0000000000000000000000000000000000000000"
+        } else {
+            &tx.to
+        };
+        Ok(Transaction {
+            to: Address::from_slice(&Vec::from_hex_auto(to_addr)?),
+            nonce: parse_u64(&tx.nonce)?,
+            gas: parse_u256(&tx.gas_limit)?,
+            gas_price: parse_u256(&tx.gas_price)?,
+            value: parse_u256(&tx.value)?,
+            data: Vec::<u8>::from_0x_hex(&tx.data)?,
+            transaction_type: TransactionType::from_str(&tx.tx_type)?,
+            access_list: tx.access_list()?,
+            max_priority_fee_per_gas: parse_u256(&tx.max_priority_fee_per_gas)?,
+            chain_id: parse_u64(&tx.chain_id)?,
+            max_fee_per_gas: parse_u256(&tx.max_fee_per_gas)?,
+        })
+    }
+}
+
+impl EthTxInput {
+    pub fn access_list(&self) -> Result<crate::transaction_types::AccessList> {
+        let mut ret_access_list = vec![];
+
+        for item in &self.access_list {
+            let mut storage_keys = vec![];
+            for key in &item.storage_keys {
+                storage_keys.push(H256::from_str(key)?);
+            }
+
+            ret_access_list.push(crate::transaction_types::AccessListItem {
+                address: Address::from_slice(&Vec::from_0x_hex(&item.address)?),
+                storage_keys,
+            });
+        }
+
+        Ok(ret_access_list)
+    }
+}
+
+impl EthMessageInput {
+    pub fn hash(&self) -> Result<Hash256> {
+        let message = utf8_or_hex_to_bytes(&self.message)?;
+        if self.signature_type == SignatureType::PersonalSign as i32 {
+            Ok(hash_message(&message))
+        } else {
+            Ok(keccak256(&message))
+        }
+    }
+}
+
+impl EthRecoverAddressInput {
+    pub fn recover_address(&self) -> Result<EthRecoverAddressOutput> {
+        let signature = Signature::from_slice(&Vec::<u8>::from_hex_auto(&self.signature)?)?;
+        let message = utf8_or_hex_to_bytes(&self.message)?;
+        let hash = keccak256(&message);
+        let pubkey = signature
+            .recover_public_key(&hash)?
+            .serialize_uncompressed();
+        let address = pubkey_to_address(&pubkey);
+
+        Ok(EthRecoverAddressOutput { address })
+    }
+}
+
+pub fn batch_personal_sign(
+    keystore: &mut Keystore,
+    data: Vec<String>,
+    path: &str,
+) -> Result<Vec<String>> {
+    let mut signatures = vec![];
+    for val in data.iter() {
+        let message = hash_message(utf8_or_hex_to_bytes(&val)?);
+        let mut signature = keystore.secp256k1_ecdsa_sign_recoverable(&message, path)?;
+        signature[64] = signature[64] + 27;
+        signatures.push(signature.to_0x_hex());
+    }
+    Ok(signatures)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::transaction::{
+        AccessList, EthMessageInput, EthMessageOutput, EthRecoverAddressInput, EthTxInput,
+        EthTxOutput, SignatureType,
+    };
+
+    use crate::signer::batch_personal_sign;
+    use tcx_constants::{CurveType, TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_keystore::{Keystore, MessageSigner, Metadata, SignatureParameters, TransactionSigner};
+
+    fn private_key_store(key: &str) -> Keystore {
+        let mut ks = Keystore::from_private_key(
+            key,
+            "imToken1",
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        ks.unlock_by_password("imToken1").unwrap();
+        ks
+    }
+
+    #[test]
+    fn test_eip155_transaction() {
+        let tx = EthTxInput {
+            nonce: "33738".to_string(),
+            gas_price: "5000000000".to_string(),
+            gas_limit: "50000".to_string(),
+            to: "0x6031564e7b2f5cc33737807b2e58daff870b590b".to_string(),
+            value: "607001513671985".to_string(),
+            data: "".to_string(),
+            chain_id: "42".to_string(),
+            tx_type: "00".to_string(),
+            max_fee_per_gas: "".to_string(),
+            max_priority_fee_per_gas: "".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("cce64585e3b15a0e4ee601a467e050c9504a0db69a559d7ec416fa25ad3410c2");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let tx_output = keystore.sign_transaction(&params, &tx).unwrap();
+
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x17fd692605405e051ac738ddf3d9b58185eaac14e434839d1453e653c5c23a1a"
+        );
+        assert_eq!(tx_output.signature, "f86d8283ca85012a05f20082c350946031564e7b2f5cc33737807b2e58daff870b590b870228108d99bd318078a09d56ef5b7ba4d6e2c4b9367ab263beb6bc2926bb9170ff2f42f0e25cbdec9aa7a062b6e1b702b1a34e887d6a3f693bdc8fbcd92e2963c12dfcffd255022d892fbe");
+    }
+
+    #[test]
+    fn test_create_contract() {
+        let tx = EthTxInput {
+            nonce: "33738".to_string(),
+            gas_price: "5000000000".to_string(),
+            gas_limit: "50000".to_string(),
+            to: "".to_string(),
+            value: "607001513671985".to_string(),
+            data: "0x11111111".to_string(),
+            chain_id: "42".to_string(),
+            tx_type: "00".to_string(),
+            max_fee_per_gas: "".to_string(),
+            max_priority_fee_per_gas: "".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("cce64585e3b15a0e4ee601a467e050c9504a0db69a559d7ec416fa25ad3410c2");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let tx_output = keystore.sign_transaction(&params, &tx).unwrap();
+
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x5830b35ec8b19b8a55b39d18d8533a97a7dfb8dba1b99e79e055099fc349602f"
+        );
+        assert_eq!(tx_output.signature, "f8718283ca85012a05f20082c350940000000000000000000000000000000000000000870228108d99bd31841111111178a0d1e3efb80e9338cf63a05b6c5209ffa3417cbbc7bdfd0eddc1ded150ad5db96ca008d395b3de0484f9ee64546b8f3de2b545b0897e9e5e63b951d56cb68accf970");
+    }
+
+    #[test]
+    fn test_etc_transaction() {
+        let tx = EthTxInput {
+            nonce: "33738".to_string(),
+            gas_price: "5000000000".to_string(),
+            gas_limit: "50000".to_string(),
+            to: "0x6031564e7b2f5cc33737807b2e58daff870b590b".to_string(),
+            value: "607001513671985".to_string(),
+            data: "".to_string(),
+            chain_id: "61".to_string(),
+            tx_type: "00".to_string(),
+            max_fee_per_gas: "".to_string(),
+            max_priority_fee_per_gas: "".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("4646464646464646464646464646464646464646464646464646464646464646");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let tx_output = keystore.sign_transaction(&params, &tx).unwrap();
+
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x6421324e5b1dcf30ff7b37e381eb94c8dad1f893d25efa8420aa653e9f19f51f"
+        );
+        assert_eq!(tx_output.signature, "f86e8283ca85012a05f20082c350946031564e7b2f5cc33737807b2e58daff870b590b870228108d99bd3180819ea0622bf0fd7e3b042cf2fc4cb62c61435f680f2dc3747a5d4e7a792aae0b3cf84fa07647e7df4158b50e71c63dbaccdff9f7d03f20f6a8dffd7295bdb6e906a4b89f");
+    }
+
+    #[test]
+    fn test_eip1559_transaction() {
+        let tx = EthTxInput {
+            nonce: "549".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "21000".to_string(),
+            to: "0x03e2B0f5369297a2E7A13d6F8e6d4BFbB9cf7dC7".to_string(),
+            value: "500000000000000".to_string(),
+            data: "".to_string(),
+            chain_id: "42".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "2000000000".to_string(),
+            max_priority_fee_per_gas: "2000000000".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("cce64585e3b15a0e4ee601a467e050c9504a0db69a559d7ec416fa25ad3410c2");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let tx_output = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(tx_output.signature, "02f8732a820225847735940084773594008252089403e2b0f5369297a2e7a13d6f8e6d4bfbb9cf7dc78701c6bf5263400080c001a0b6bd8b2f4d94910d72906cb20f83e9ec0808e00e92e8338f68a496ee77c29245a00c77abda1141f4991774b240f0fcd55faa19584e06d2bd43d4d5ceb6d4381207");
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x812824e60c60f8d46aa5e211c8e4a50baf92350c98c83e71c379d273ce0a0787"
+        );
+
+        let tx = EthTxInput {
+            nonce: "548".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "220".to_string(),
+            to: "0x87e65b8280098da8f9bb3a69643573378da87542".to_string(),
+            value: "44902".to_string(),
+            data: "0x3400711e1d0bfbcf".to_string(),
+            chain_id: "42".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "2298206284".to_string(),
+            max_priority_fee_per_gas: "163".to_string(),
+            access_list: vec![],
+        };
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x90b1a2325ee4acb953e67a9b05c5b7048dc30ac222f8736b82ea4222b5a5721e"
+        );
+        assert_eq!(tx_output.signature, "02f8722a82022481a38488fbd84c81dc9487e65b8280098da8f9bb3a69643573378da8754282af66883400711e1d0bfbcfc001a03e202f7d17126f8cc3f17a3fb96508d52d7cdd93dc862481ff9b9653c71bb254a04d34bef9821db11b7f5b6d4b303b07793248fc0f34223b5884601f5511da3abc");
+
+        let tx = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "14298499".to_string(),
+            to: "0xef970655297d1234174bcfe31ee803aaa97ad0ca".to_string(),
+            value: "11".to_string(),
+            data: "0xee".to_string(),
+            chain_id: "130".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "850895266216".to_string(),
+            max_priority_fee_per_gas: "69".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("0626687a500e27ffca881fe129541f1a2033aedd32186a0540c10e3d0588b4f7");
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0xa8b660bec405dca182e526401b03aab04f0f3547ba7382e89f73bb3b3aae0829"
+        );
+        assert_eq!(tx_output.signature, "02f86a8182084585c61d4f61a883da2d8394ef970655297d1234174bcfe31ee803aaa97ad0ca0b81eec001a060364c7bddc7d080dcdbf859a6d8316b297d27c4ebd6288ccc6591e5870fff74a05e9b1a2074062dbf84c757a940a92d0d5712eaebd1043665478f16deb26347c8");
+
+        let mut access_list = vec![];
+        access_list.push(AccessList {
+            address: "0x70b361fc3a4001e4f8e4e946700272b51fe4f0c4".to_string(),
+            storage_keys: vec![
+                "0x8419643489566e30b68ce5bc642e166f86e844454c99a03ed4a3d4a2b9a96f63".to_string(),
+                "0x8a2a020581b8f3142a9751344796fb1681a8cde503b6662d43b8333f863fb4d3".to_string(),
+                "0x897544db13bf6cd166ce52498d894fe6ce5a8d2096269628e7f971e818bf9ab9".to_string(),
+            ],
+        });
+        let tx = EthTxInput {
+            nonce: "4".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "54".to_string(),
+            to: "0xd5539a0e4d27ebf74515fc4acb38adcc3c513f25".to_string(),
+            value: "64".to_string(),
+            data: "0xf579eebd8a5295c6f9c86e".to_string(),
+            chain_id: "276".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "963240322143".to_string(),
+            max_priority_fee_per_gas: "28710".to_string(),
+            access_list,
+        };
+        let mut keystore =
+            private_key_store("c69e17f597758c69dc181956060bef908e5a89fc00313aac0da6e387121648c2");
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x0a0b6c71e52fcb14ba60e271e71c410783beb2448e06822c5f148f9d3fe796c3"
+        );
+        assert_eq!(tx_output.signature, "02f8f18201140482702685e04598e45f3694d5539a0e4d27ebf74515fc4acb38adcc3c513f25408bf579eebd8a5295c6f9c86ef87cf87a9470b361fc3a4001e4f8e4e946700272b51fe4f0c4f863a08419643489566e30b68ce5bc642e166f86e844454c99a03ed4a3d4a2b9a96f63a08a2a020581b8f3142a9751344796fb1681a8cde503b6662d43b8333f863fb4d3a0897544db13bf6cd166ce52498d894fe6ce5a8d2096269628e7f971e818bf9ab980a0c34ce2038e430ecf67194a78cf47da1ff6c6fff427a43d4a7caf0cec52d6be0da065f6bf0e34a511bf3b81510d46510b3420fee86637120df4a56ef07fc8704e40");
+
+        let mut access_list = vec![];
+        access_list.push(AccessList {
+            address: "0x55a7ce45514b6e71743bbb67e9959bd19eefb8ed".to_string(),
+            storage_keys: vec![
+                "0x766d2c1aef5f615a3f935de247800dfbf9a8bb7be5a43795f78f9c83f24f013d".to_string(),
+                "0xb34339a846e7a304ad82e20b3cf05260698566efc1c6488bf851689a279d262e".to_string(),
+            ],
+        });
+        let tx = EthTxInput {
+            nonce: "6".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "10884139".to_string(),
+            to: "0xd24911709fa01130804188b5c76ed65bfdfd6a05".to_string(),
+            value: "4990".to_string(),
+            data: "0xe9290f2d3d754ba522".to_string(),
+            chain_id: "225".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "2984486799".to_string(),
+            max_priority_fee_per_gas: "183".to_string(),
+            access_list,
+        };
+        let mut keystore =
+            private_key_store("272bbc8b388511b2fb17315ec77c802187368e82459081e0ce3229ed30b8001c");
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0xdec9d2ca302a5421a9ab5ce568899eb2dae6ba89b2051a5e15be8506246524c4"
+        );
+        assert_eq!(tx_output.signature, "02f8d081e10681b784b1e3a78f83a6142b94d24911709fa01130804188b5c76ed65bfdfd6a0582137e89e9290f2d3d754ba522f85bf8599455a7ce45514b6e71743bbb67e9959bd19eefb8edf842a0766d2c1aef5f615a3f935de247800dfbf9a8bb7be5a43795f78f9c83f24f013da0b34339a846e7a304ad82e20b3cf05260698566efc1c6488bf851689a279d262e01a0fec0c018ec049c8278e346b290cd74d68cc5b18fac6c8dc9abbe7155367681cea02c2592c44cdae3d0a1017ab30f61486ddba1a45ba358e1c66e493b652e8827e1");
+
+        let mut access_list = vec![];
+        access_list.push(AccessList {
+            address: "0x4824aec0a347a627d2bd88ae1f69a41b0665fed0".to_string(),
+            storage_keys: vec![],
+        });
+        let tx = EthTxInput {
+            nonce: "3".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "41708".to_string(),
+            to: "0xaf9031dff5db0a02d25cd09b3cbb0d3f7f332faf".to_string(),
+            value: "44939".to_string(),
+            data: "0x4f".to_string(),
+            chain_id: "365".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "259340687386".to_string(),
+            max_priority_fee_per_gas: "223".to_string(),
+            access_list,
+        };
+        let mut keystore =
+            private_key_store("1515a472fde48c24c6e7f565397e683f3c3a33cb57bcd3bffc06444081aac1fb");
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x6dc6942e91746d1df6637b32cc7e3d4ec3bbe943d85cd8e32a30d6b6367558ed"
+        );
+        assert_eq!(tx_output.signature, "02f88382016d0381df853c61e8d81a82a2ec94af9031dff5db0a02d25cd09b3cbb0d3f7f332faf82af8b4fd7d6944824aec0a347a627d2bd88ae1f69a41b0665fed0c080a016fd2a3b319df64713a402c20c9f2cccf16449fb1ad850d1dd5defc3d154e680a012adb991599d3c7cc7279aaf7ebee8ed9278f0574fa5899ddbfd5688921b9d0f");
+
+        let mut access_list = vec![];
+        access_list.push(AccessList {
+            address: "0x019fda53b3198867b8aae65320c9c55d74de1938".to_string(),
+            storage_keys: vec![],
+        });
+        access_list.push(AccessList {
+            address: "0x1b976cdbc43cfcbeaad2623c95523981ea1e664a".to_string(),
+            storage_keys: vec![
+                "0xd259410e74fa5c0227f688cc1f79b4d2bee3e9b7342c4c61342e8906a63406a2".to_string(),
+            ],
+        });
+        access_list.push(AccessList {
+            address: "0xf1946eba70f89687d67493d8106f56c90ecba943".to_string(),
+            storage_keys: vec![
+                "0xb3838dedffc33c62f8abfc590b41717a6dd70c3cab5a6900efae846d9060a2b9".to_string(),
+                "0x6a6c4d1ab264204fb2cdd7f55307ca3a0040855aa9c4a749a605a02b43374b82".to_string(),
+                "0x0c38e901d0d95fbf8f05157c68a89393a86aa1e821279e4cce78f827dccb2064".to_string(),
+            ],
+        });
+        let tx = EthTxInput {
+            nonce: "1".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "4286".to_string(),
+            to: "0x6f4ecd70932d65ac08b56db1f4ae2da4391f328e".to_string(),
+            value: "3490361".to_string(),
+            data: "0x200184c0486d5f082a27".to_string(),
+            chain_id: "63".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list,
+        };
+        let mut keystore =
+            private_key_store("d639ec503c8acc27d2a57a4477864d43aad1bf84c2270f47207ca372c7dc480b");
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0xf512934c8e6d1d1436488c9584eeb9b2d8bf1a8bc361d268c2a55aa31fb6f3c3"
+        );
+        assert_eq!(tx_output.signature, "02f901413f0181e285faac6c45d88210be946f4ecd70932d65ac08b56db1f4ae2da4391f328e833542398a200184c0486d5f082a27f8cbd694019fda53b3198867b8aae65320c9c55d74de1938c0f7941b976cdbc43cfcbeaad2623c95523981ea1e664ae1a0d259410e74fa5c0227f688cc1f79b4d2bee3e9b7342c4c61342e8906a63406a2f87a94f1946eba70f89687d67493d8106f56c90ecba943f863a0b3838dedffc33c62f8abfc590b41717a6dd70c3cab5a6900efae846d9060a2b9a06a6c4d1ab264204fb2cdd7f55307ca3a0040855aa9c4a749a605a02b43374b82a00c38e901d0d95fbf8f05157c68a89393a86aa1e821279e4cce78f827dccb206480a00d2e19fb7caa581e759fa73ef0fb83c8177e56c8370155dcd3ae9d207e113813a0671824c1c23407a0e695ada7e4a3a4e0d7bbe65ca930e46639862b732d63c921");
+    }
+
+    #[test]
+    fn test_bsc_hex_chain_id() {
+        let tx = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "20000000008".to_string(),
+            gas_limit: "189000".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "512".to_string(),
+            data: "".to_string(),
+            chain_id: "0x38".to_string(),
+            tx_type: "".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x1a3c3947ea626e00d6ff1493bcf929b9320d15ff088046990ef88a45f7d37623"
+        );
+        assert_eq!(tx_output.signature, "f868088504a817c8088302e248943535353535353535353535353535353535353535820200808194a003479f1d6be72af58b1d60750e155c435e435726b5b690f4d3e59f34bd55e578a0314d2b03d29dc3f87ff95c3427658952add3cf718d3b6b8604068fc3105e4442");
+    }
+
+    #[test]
+    fn test_sign_tx_int_chain_id() {
+        let tx = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "20000000008".to_string(),
+            gas_limit: "189000".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "512".to_string(),
+            data: "".to_string(),
+            chain_id: "1".to_string(),
+            tx_type: "".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+
+        assert_eq!(
+            tx_output.tx_hash,
+            "0xa10172bcf5002ccd23bc1785fd6caf2f663a2430b6710ec539429230ec615073"
+        );
+        assert_eq!(tx_output.signature, "f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a0e57f7d1452aae9ff62ceb478f62d4ef038b76dbb6b698f4e0f64732022ba53bfa0389ad6a3648b9469c26127244e5e0d33b2a7ae170b0a14b20bec99aed5497895");
+    }
+
+    #[test]
+    fn test_sign_tx_hex_chain_id() {
+        let tx = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "20000000008".to_string(),
+            gas_limit: "189000".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "512".to_string(),
+            data: "".to_string(),
+            chain_id: "0xA3".to_string(),
+            tx_type: "".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x0e3cc87e9f4924a01edc5e09c27f9b1f9fcdb1c6a2a637fb28fd9efe39af42b0"
+        );
+        assert_eq!(tx_output.signature, "f869088504a817c8088302e2489435353535353535353535353535353535353535358202008082016aa083797cbcee123d37c6006d7518d71b02ecd8fcb5629f7c2ea3b8546350931755a032ddd89a62bc48e20a2a58d35dffa94ed1325a7e526cf94676b3726e1e538d88");
+    }
+
+    #[test]
+    fn test_sign_big_chain_id() {
+        let tx = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "20000000008".to_string(),
+            gas_limit: "189000".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "512".to_string(),
+            data: "".to_string(),
+            chain_id: "1313161554".to_string(),
+            tx_type: "".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list: vec![],
+        };
+        let mut keystore =
+            private_key_store("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let tx_output: EthTxOutput = keystore.sign_transaction(&params, &tx).unwrap();
+        assert_eq!(
+            tx_output.tx_hash,
+            "0x66617e83ddfb63b5853e18a99af169651ad07ff5ca2eae812d9b79ceedda1174"
+        );
+        assert_eq!(tx_output.signature, "f86b088504a817c8088302e24894353535353535353535353535353535353535353582020080849c8a82c7a098c8ea50a36a00ee155db34340157fe34f76690466aca9e87f337ea3ba847cdba001b7742139071ef81c874b783c3aa1ef9261ac0096eba81e6936998d8c8ecd74");
+    }
+
+    #[test]
+    fn test_sign_message() {
+        let message = EthMessageInput {
+            message: "Hello imToken".to_string(),
+            signature_type: SignatureType::PersonalSign as i32,
+        };
+        let mut keystore =
+            private_key_store("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let output: EthMessageOutput = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            output.signature,
+            "0x1be38ff0ab0e6d97cba73cf61421f0641628be8ee91dcb2f73315e7fdf4d0e2770b0cb3cc7350426798d43f0fb05602664a28bb2c9fcf46a07fa1c8c4e322ec01b"
+        );
+
+        let message = EthMessageInput {
+            message: "0xef678007d18427e6022059dbc264f27507cd1ffc".to_string(),
+            signature_type: SignatureType::PersonalSign as i32,
+        };
+        let output: EthMessageOutput = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            output.signature,
+            "0xb12a1c9d3a7bb722d952366b06bd48cb35bdf69065dee92351504c3716a782493c697de7b5e59579bdcc624aa277f8be5e7f42dc65fe7fcd4cc68fef29ff28c21b"
+        );
+    }
+
+    #[test]
+    fn test_sign_message_by_hd() {
+        let mut keystore =
+            Keystore::from_mnemonic(&TEST_MNEMONIC, &TEST_PASSWORD, Metadata::default()).unwrap();
+        keystore.unlock_by_password(&TEST_PASSWORD).unwrap();
+
+        let message = EthMessageInput {
+            message: "hello world".to_string(),
+            signature_type: SignatureType::PersonalSign as i32,
+        };
+
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let output: EthMessageOutput = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(output.signature, "0x521d0e4b5808b7fbeb53bf1b17c7c6d60432f5b13b7aa3aaed963a894c3bd99e23a3755ec06fa7a61b031192fb5fab6256e180e086c2671e0a574779bb8593df1b");
+    }
+
+    #[test]
+    fn test_ec_sign() {
+        let message = EthMessageInput {
+            message: "Hello imToken".to_string(),
+            signature_type: SignatureType::EcSign as i32,
+        };
+        let mut keystore =
+            private_key_store("3c9229289a6125f7fdf1885a77bb12c37a8d3b4962d936f7e3084dece32a3ca1");
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let sign_output = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            sign_output.signature,
+            "0x648081bc111e6116769bdb4396eebe17f58d3eddc0aeb04a868990deac9dfa2f322514a380fa66e0e864faaac6ef936092cdc022f5fd7d61cb501193ede537b31b"
+        );
+        let message = EthMessageInput {
+            message: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_string(),
+            signature_type: SignatureType::EcSign as i32,
+        };
+        let sign_output = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            sign_output.signature,
+            "0x65e4952899a8dcadf3a65a11bdac0f0cfdf93e0bae5c67674c78a72631de524d3cafe27ea71c86aa3fd838c6a50a0b09d6ece85a6dcf3ce85c30fdc51380ebdf1b"
+        );
+
+        let message = EthMessageInput {
+            message: "0000000000000000".to_string(),
+            signature_type: SignatureType::EcSign as i32,
+        };
+        let sign_output = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            sign_output.signature,
+            "0xf85b21d47d4a828b0829bd3d0b7dbd19cb7fb8d75c24d03f424beddb38d6eb2456f3f438b18453826ce9eaf4b887a2e899e63e73c265dcd8ae0bc507184590a51c"
+        );
+
+        let message = EthMessageInput {
+            message: "0x0000000000000000".to_string(),
+            signature_type: SignatureType::EcSign as i32,
+        };
+        let sign_output = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            sign_output.signature,
+            "0xb35fe7d2e45098ef21264bc08d0c252a4a7b29f8a24ff25252e0f0c5b38e0ef0776bd12c9595353bdd4a118f8117182d543fa8f25d64a121c03c71f3a4e81b651b"
+        );
+
+        let message = EthMessageInput {
+            message:
+                "0x81f26727a6b5478D25bb4524AdeAeE11eC36633ce09d21e3-533d-447c-a185-8b148fb5b568"
+                    .to_string(),
+            signature_type: SignatureType::EcSign as i32,
+        };
+        let sign_output = keystore.sign_message(&params, &message).unwrap();
+        assert_eq!(
+            sign_output.signature,
+            "0x19a39d2da6c7c8abc8babd6dbb9063f30273e3babf819e786f4ae14509cc7a017d08e7ae63b50925ba71dbdaaf9e9db417b97eab2199e3b91fae86493a51229b1c"
+        );
+    }
+
+    #[test]
+    fn test_address_recover() {
+        let input = EthRecoverAddressInput {
+            message: "0x0000000000000000".to_string(),
+            signature: "0xb35fe7d2e45098ef21264bc08d0c252a4a7b29f8a24ff25252e0f0c5b38e0ef0776bd12c9595353bdd4a118f8117182d543fa8f25d64a121c03c71f3a4e81b651b".to_string(),
+        };
+        let output = input.recover_address().unwrap();
+        println!("{}", output.address);
+        assert_eq!(output.address, "0xed54a7c1d8634bb589f24bb7f05a5554b36f9618");
+    }
+
+    #[test]
+    fn test_batch_personal_sign() {
+        let mut keystore =
+            private_key_store("a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6");
+
+        let test_data = vec![
+            "Hello imToken".to_string(),
+            "0xef678007d18427e6022059dbc264f27507cd1ffc".to_string(),
+        ];
+
+        let result = batch_personal_sign(&mut keystore, test_data, "").unwrap();
+        assert_eq!(result[0], "0x1be38ff0ab0e6d97cba73cf61421f0641628be8ee91dcb2f73315e7fdf4d0e2770b0cb3cc7350426798d43f0fb05602664a28bb2c9fcf46a07fa1c8c4e322ec01b".to_string());
+        assert_eq!(result[1], "0xb12a1c9d3a7bb722d952366b06bd48cb35bdf69065dee92351504c3716a782493c697de7b5e59579bdcc624aa277f8be5e7f42dc65fe7fcd4cc68fef29ff28c21b".to_string());
+    }
+}
diff --git a/token-core/tcx-eth/src/transaction.rs b/token-core/tcx-eth/src/transaction.rs
new file mode 100644
index 00000000..dd8c2a3c
--- /dev/null
+++ b/token-core/tcx-eth/src/transaction.rs
@@ -0,0 +1,88 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EthTxInput {
+    #[prost(string, tag = "1")]
+    pub nonce: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub gas_price: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub gas_limit: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub to: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub value: ::prost::alloc::string::String,
+    #[prost(string, tag = "6")]
+    pub data: ::prost::alloc::string::String,
+    #[prost(string, tag = "7")]
+    pub chain_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "8")]
+    pub tx_type: ::prost::alloc::string::String,
+    #[prost(string, tag = "9")]
+    pub max_fee_per_gas: ::prost::alloc::string::String,
+    #[prost(string, tag = "10")]
+    pub max_priority_fee_per_gas: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "11")]
+    pub access_list: ::prost::alloc::vec::Vec<AccessList>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccessList {
+    #[prost(string, tag = "1")]
+    pub address: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "2")]
+    pub storage_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EthTxOutput {
+    #[prost(string, tag = "1")]
+    pub signature: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub tx_hash: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EthMessageInput {
+    #[prost(string, tag = "1")]
+    pub message: ::prost::alloc::string::String,
+    #[prost(enumeration = "SignatureType", tag = "2")]
+    pub signature_type: i32,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EthMessageOutput {
+    #[prost(string, tag = "1")]
+    pub signature: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EthRecoverAddressInput {
+    #[prost(string, tag = "1")]
+    pub message: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub signature: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EthRecoverAddressOutput {
+    #[prost(string, tag = "1")]
+    pub address: ::prost::alloc::string::String,
+}
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum SignatureType {
+    PersonalSign = 0,
+    EcSign = 1,
+}
+impl SignatureType {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            SignatureType::PersonalSign => "PersonalSign",
+            SignatureType::EcSign => "EcSign",
+        }
+    }
+}
diff --git a/token-core/tcx-eth/src/transaction_types.rs b/token-core/tcx-eth/src/transaction_types.rs
new file mode 100644
index 00000000..d7de003e
--- /dev/null
+++ b/token-core/tcx-eth/src/transaction_types.rs
@@ -0,0 +1,403 @@
+use super::Result;
+use anyhow::anyhow;
+use ethereum_types::{Address, H256, U256, U64};
+use rlp::RlpStream;
+use secp256k1::{ecdsa::RecoverableSignature, ecdsa::RecoveryId, Message, PublicKey};
+use std::str::FromStr;
+use tcx_common::{keccak256, Hash256, ToHex};
+use tcx_primitive::SECP256K1_ENGINE;
+
+pub fn to_eip155_v<T: Into<u64>>(recovery_id: T, chain_id: U64) -> U64 {
+    U64::from(recovery_id.into() + 35 + chain_id.as_u64() * 2)
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum TransactionType {
+    Legacy,
+    Eip2930,
+    Eip1559,
+}
+
+impl Default for TransactionType {
+    fn default() -> Self {
+        TransactionType::Legacy
+    }
+}
+
+impl FromStr for TransactionType {
+    type Err = anyhow::Error;
+
+    fn from_str(tx_type: &str) -> Result<Self> {
+        match tx_type {
+            "0x01" | "1" | "01" => Ok(TransactionType::Eip2930),
+            "0x02" | "2" | "02" => Ok(TransactionType::Eip1559),
+            _ => Ok(TransactionType::Legacy),
+        }
+    }
+}
+
+pub type AccessList = Vec<AccessListItem>;
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct AccessListItem {
+    pub address: Address,
+    pub storage_keys: Vec<H256>,
+}
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct Signature {
+    pub v: U64,
+    pub r: U256,
+    pub s: U256,
+}
+
+impl ToHex for Signature {
+    fn to_hex(&self) -> String {
+        <[u8; 65]>::from(self).to_hex()
+    }
+}
+
+impl From<&Signature> for [u8; 65] {
+    fn from(src: &Signature) -> [u8; 65] {
+        let mut sig = [0u8; 65];
+        let mut r_bytes = [0u8; 32];
+        let mut s_bytes = [0u8; 32];
+        src.r.to_big_endian(&mut r_bytes);
+        src.s.to_big_endian(&mut s_bytes);
+        sig[..32].copy_from_slice(&r_bytes);
+        sig[32..64].copy_from_slice(&s_bytes);
+        // TODO: What if we try to serialize a signature where
+        // the `v` is not normalized?
+
+        // The u64 to u8 cast is safe because `sig.v` can only ever be 27 or 28
+        // here. Regarding EIP-155, the modification to `v` happens during tx
+        // creation only _after_ the transaction is signed using
+        // `ethers_signers::to_eip155_v`.
+        sig[64] = src.v.as_u64() as u8;
+        sig
+    }
+}
+
+impl Signature {
+    pub fn from_slice(data: &[u8]) -> Result<Self> {
+        if data.len() != 65 {
+            return Err(anyhow!("Invalid signature length"));
+        }
+
+        let v = if data[64] >= 27 {
+            U64::from(data[64])
+        } else {
+            U64::from(data[64] + 27)
+        };
+
+        Ok(Signature {
+            v,
+            r: U256::from_big_endian(&data[0..32]),
+            s: U256::from_big_endian(&data[32..64]),
+        })
+    }
+
+    pub fn recover_public_key(&self, hash: &[u8]) -> Result<PublicKey> {
+        let message = Message::from_slice(hash)?;
+        let recovery_id = RecoveryId::from_i32(self.v.as_u32() as i32 - 27)?;
+        let sig = <[u8; 65]>::from(self);
+        let signature = RecoverableSignature::from_compact(&sig[0..64], recovery_id)?;
+
+        Ok(SECP256K1_ENGINE.recover_ecdsa(&message, &signature)?)
+    }
+}
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct Transaction {
+    pub to: Address,
+    pub nonce: U64,
+    pub gas: U256,
+    pub gas_price: U256,
+    pub value: U256,
+    pub data: Vec<u8>,
+    pub access_list: AccessList,
+    pub max_priority_fee_per_gas: U256,
+    pub max_fee_per_gas: U256,
+    pub chain_id: U64,
+    pub transaction_type: TransactionType,
+}
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct SignedTransaction {
+    pub transaction: Transaction,
+    pub signature: Signature,
+}
+
+impl SignedTransaction {
+    pub fn hash(&self) -> H256 {
+        H256::from(keccak256(self.raw().as_slice()))
+    }
+
+    pub fn raw(&self) -> Vec<u8> {
+        self.transaction.encode(Some(&self.signature))
+    }
+}
+
+impl Transaction {
+    fn rlp_append_legacy(&self, stream: &mut RlpStream) {
+        stream.append(&self.nonce);
+        stream.append(&self.gas_price);
+        stream.append(&self.gas);
+        stream.append(&self.to);
+        stream.append(&self.value);
+        stream.append(&self.data);
+    }
+
+    fn encode_legacy(&self, signature: Option<&Signature>) -> RlpStream {
+        let mut stream = RlpStream::new();
+
+        stream.begin_list(9);
+
+        self.rlp_append_legacy(&mut stream);
+
+        if let Some(signature) = signature {
+            self.rlp_append_signature(&mut stream, signature);
+        } else {
+            stream.append(&self.chain_id);
+            stream.append(&0u8);
+            stream.append(&0u8);
+        }
+
+        stream
+    }
+
+    fn encode_eip2930_payload(&self, signature: Option<&Signature>) -> RlpStream {
+        let mut stream = RlpStream::new();
+
+        let list_size = if signature.is_some() { 11 } else { 8 };
+        stream.begin_list(list_size);
+
+        // append chain_id. from EIP-2930: chainId is defined to be an integer of arbitrary size.
+        stream.append(&self.chain_id);
+
+        self.rlp_append_legacy(&mut stream);
+        self.rlp_append_access_list(&mut stream);
+
+        if let Some(signature) = signature {
+            self.rlp_append_signature(&mut stream, signature);
+        }
+
+        stream
+    }
+
+    fn encode_eip1559_payload(&self, signature: Option<&Signature>) -> RlpStream {
+        let mut stream = RlpStream::new();
+
+        let list_size = if signature.is_some() { 12 } else { 9 };
+        stream.begin_list(list_size);
+
+        stream.append(&self.chain_id);
+
+        stream.append(&self.nonce);
+        stream.append(&self.max_priority_fee_per_gas);
+        stream.append(&self.max_fee_per_gas);
+        stream.append(&self.gas);
+        stream.append(&self.to);
+        stream.append(&self.value);
+        stream.append(&self.data);
+
+        self.rlp_append_access_list(&mut stream);
+
+        if let Some(signature) = signature {
+            self.rlp_append_signature(&mut stream, signature);
+        }
+
+        stream
+    }
+
+    fn rlp_append_signature(&self, stream: &mut RlpStream, signature: &Signature) {
+        match self.transaction_type {
+            TransactionType::Eip2930 | TransactionType::Eip1559 => {
+                stream.append(&U64::from(signature.v.as_u64() - 27))
+            }
+            _ => stream.append(&to_eip155_v(signature.v.as_u64() - 27, self.chain_id)),
+        };
+
+        stream.append(&signature.r);
+        stream.append(&signature.s);
+    }
+
+    fn rlp_append_access_list(&self, stream: &mut RlpStream) {
+        stream.begin_list(self.access_list.len());
+        for access in self.access_list.iter() {
+            stream.begin_list(2);
+            stream.append(&access.address);
+            stream.begin_list(access.storage_keys.len());
+            for storage_key in access.storage_keys.iter() {
+                stream.append(storage_key);
+            }
+        }
+    }
+
+    pub fn encode(&self, signature: Option<&Signature>) -> Vec<u8> {
+        match self.transaction_type {
+            TransactionType::Legacy => {
+                let stream = self.encode_legacy(signature);
+                stream.out().to_vec()
+            }
+
+            TransactionType::Eip2930 => {
+                let stream = self.encode_eip2930_payload(signature);
+                [&[1], stream.as_raw()].concat()
+            }
+
+            TransactionType::Eip1559 => {
+                let stream = self.encode_eip1559_payload(signature);
+                [&[2], stream.as_raw()].concat()
+            }
+        }
+    }
+
+    pub fn sighash(&self) -> Hash256 {
+        keccak256(&self.encode(None))
+    }
+
+    pub fn to_signed_tx(&self, signature: Signature) -> SignedTransaction {
+        SignedTransaction {
+            transaction: self.clone(),
+            signature,
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::{Signature, SignedTransaction, Transaction, TransactionType};
+    use crate::transaction_types::AccessListItem;
+    use ethereum_types::{Address, H160, H256, U256, U64};
+    use std::str::FromStr;
+    use tcx_common::ToHex;
+
+    fn test_encode_transaction() {
+        let inputs = vec![
+            "f8ac826b4685152b17381683015f90946149c26cd2f7b5ccdb32029af817123f6e37df5b80b844a9059cbb0000000000000000000000004bc7610cc68c1647a3898273fd5c6fada35231ec000000000000000000000000000000000000000000000016a8ea51575148000025a0cf11204d960208f37e5cbb1f77c65868e94fcd7d1b6e1a4024c3de2ff038fbd6a04355c8fc835261d4a31b0195af79dfc6a24e3c1e8efb540144618c36f2c9b61a",
+            "02f875018321ad6f847735940085266ac4320082520894526ea8b99ba85ec6d883b06545f4b76b60ffe14d879790f8dbf7100080c080a06126c506f0f6b35eca2087e8eb05287d98ccde7fb29499338c70e836538ec212a067eaf101982fb70eb15074c7e58807dac1c725bb33871801d769019efbb0721c",
+            "01f902b801820486854671ef231a8307a120947da08ac2740268f36634c2579739be26a123595880b8e4a4629a100000000000000000000000006d7b6dad6abed1dfa5eba37a6667ba9dcfd49077000000000000000000000000132eeb05d5cb6829bd34f552cde0b6b708ef501400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000003da7cd5f6614bd440000000000000000000000000000000000000000000000456a8e21f079c20b8c0000000000000000000000000000000000000000000000003e39a04969da8e6e0000000000000000000000000000000000000000000000000000000000c8913df90168d6941b40183efb4dd766f11bda7a7c3ad8982e998421c0d694c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2c0f89b946d7b6dad6abed1dfa5eba37a6667ba9dcfd49077f884a00000000000000000000000000000000000000000000000000000000000000006a00000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000008a0000000000000000000000000000000000000000000000000000000000000000cf89b94132eeb05d5cb6829bd34f552cde0b6b708ef5014f884a00000000000000000000000000000000000000000000000000000000000000006a00000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000008a0000000000000000000000000000000000000000000000000000000000000000c80a0e8f03759dc73deaf10ceabc76e206b3a3353a19cbc908ba87c34e5f1d4dc7ef9a0681de4e59147a73ec88422fe9266a7f263c86c4c809e9179a5431fdd5cbe68b4",
+            "f8a8808503dea3b69c82d03294dac17f958d2ee523a2206206994597c13d831ec780b844095ea7b30000000000000000000000008a42d311d282bfcaa5133b2de0a8bcdbecea3073ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff269f5327baacf5a3ae6523c6e6ebaa0cd8f98a8ac513c1baed06ec4811b1cfd979a04e4a4714104d70a6f6b91e80846ff8864aa5343e3afcd9ec59683fb011059cfb"];
+        let hashs = vec![
+            "83ab13113196831454d55ace3a3975da33ec0dc7126767c420258df11407df89",
+            "a44c3f4b6fd573f1b5585e6fb9624eb589537f03c25461828767c7b3d56fbb3f",
+            "e19e246e305b2c092e77028777a86144c5fc3f56d41c4bdfcc32ce2438993358",
+            "885525dbd0a74e58570a0e96a851225cb8f5c690c49b554d9a69c79389ac0374",
+        ];
+        let signed_transactions = vec![
+            SignedTransaction {
+                transaction: Transaction {
+                    to: Address::from_str("6149c26cd2f7b5ccdb32029af817123f6e37df5b").unwrap(),
+                    nonce: U64::from(0x6b46),
+                    gas: U256::from_str("15f90").unwrap(),
+                    gas_price: U256::from_str("152b173816").unwrap(),
+                    value: U256::from_str("00").unwrap(),
+                    data: hex::decode("a9059cbb0000000000000000000000004bc7610cc68c1647a3898273fd5c6fada35231ec000000000000000000000000000000000000000000000016a8ea515751480000").unwrap(),
+                    transaction_type: TransactionType::Legacy,
+                    access_list: vec![],
+                    max_priority_fee_per_gas: U256::from_str("00").unwrap(),
+                    max_fee_per_gas: U256::from_str("00").unwrap(),
+                    chain_id: U64::from(1),
+                },
+                signature: Signature {
+                    v: U64::from(0x25+27),
+                    r: U256::from_str("cf11204d960208f37e5cbb1f77c65868e94fcd7d1b6e1a4024c3de2ff038fbd6").unwrap(),
+                    s: U256::from_str("4355c8fc835261d4a31b0195af79dfc6a24e3c1e8efb540144618c36f2c9b61a").unwrap(),
+                },
+            },
+            SignedTransaction {
+                transaction: Transaction {
+                    gas: U256::from_str("5208").unwrap(),
+                    gas_price: U256::from_str("266ac43200").unwrap(),
+                    max_fee_per_gas: U256::from_str("266ac43200").unwrap(),
+                    max_priority_fee_per_gas: U256::from_str("77359400").unwrap(),
+                    data: vec![],
+                    nonce: U64::from(0x21ad6f),
+                    value: U256::from_str("9790f8dbf71000").unwrap(),
+                    to: Address::from_str("526ea8b99ba85ec6d883b06545f4b76b60ffe14d").unwrap(),
+                    transaction_type: TransactionType::Eip1559,
+                    access_list: vec![],
+                    chain_id: U64::from(1),
+                },
+                signature: Signature {
+                    v: U64::from(0x0+27),
+                    r: U256::from_str("6126c506f0f6b35eca2087e8eb05287d98ccde7fb29499338c70e836538ec212").unwrap(),
+                    s: U256::from_str("67eaf101982fb70eb15074c7e58807dac1c725bb33871801d769019efbb0721c").unwrap(),
+                },
+            },
+            SignedTransaction {
+                transaction: Transaction {
+                    to: Address::from_str("7da08ac2740268f36634c2579739be26a1235958").unwrap(),
+                    nonce: U64::from(0x486),
+                    gas: U256::from_str("7a120").unwrap(),
+                    gas_price: U256::from_str("4671ef231a").unwrap(),
+                    max_fee_per_gas: U256::from_str("4671ef231a").unwrap(),
+                    value: U256::from_str("0").unwrap(),
+                    data: hex::decode("a4629a100000000000000000000000006d7b6dad6abed1dfa5eba37a6667ba9dcfd49077000000000000000000000000132eeb05d5cb6829bd34f552cde0b6b708ef501400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000003da7cd5f6614bd440000000000000000000000000000000000000000000000456a8e21f079c20b8c0000000000000000000000000000000000000000000000003e39a04969da8e6e0000000000000000000000000000000000000000000000000000000000c8913d").unwrap(),
+                    transaction_type: TransactionType::Eip2930,
+                    access_list: vec![
+                        AccessListItem {
+                            address: H160::from_str("1b40183efb4dd766f11bda7a7c3ad8982e998421").unwrap(),
+                            storage_keys: vec![],
+                        },
+                        AccessListItem {
+                            address: H160::from_str("c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2").unwrap(),
+                            storage_keys: vec![]
+                        },
+                        AccessListItem {
+                            address: H160::from_str("6d7b6dad6abed1dfa5eba37a6667ba9dcfd49077").unwrap(),
+                            storage_keys: vec![
+                                H256::from_str("0000000000000000000000000000000000000000000000000000000000000006").unwrap(),
+                                H256::from_str("0000000000000000000000000000000000000000000000000000000000000007").unwrap(),
+                                H256::from_str("0000000000000000000000000000000000000000000000000000000000000008").unwrap(),
+                                H256::from_str("000000000000000000000000000000000000000000000000000000000000000c").unwrap(),
+                            ],
+                        },
+                        AccessListItem {
+                            address: H160::from_str("132eeb05d5cb6829bd34f552cde0b6b708ef5014").unwrap(),
+                            storage_keys: vec![
+                                H256::from_str("0000000000000000000000000000000000000000000000000000000000000006").unwrap(),
+                                H256::from_str("0000000000000000000000000000000000000000000000000000000000000007").unwrap(),
+                                H256::from_str("0000000000000000000000000000000000000000000000000000000000000008").unwrap(),
+                                H256::from_str("000000000000000000000000000000000000000000000000000000000000000c").unwrap(),
+                            ]
+                        }
+                    ],
+                    max_priority_fee_per_gas: U256::from_str("0").unwrap(),
+                    chain_id: U64::from(1),
+                },
+                signature: Signature {
+                    v: U64::from(0x0 + 27),
+                    r: U256::from_str("e8f03759dc73deaf10ceabc76e206b3a3353a19cbc908ba87c34e5f1d4dc7ef9").unwrap(),
+                    s: U256::from_str("681de4e59147a73ec88422fe9266a7f263c86c4c809e9179a5431fdd5cbe68b4").unwrap(),
+                },
+            },
+            SignedTransaction {
+                transaction: Transaction {
+                    gas: U256::from_str("d032").unwrap(),
+                    gas_price: U256::from_str("03dea3b69c").unwrap(),
+                    max_fee_per_gas: U256::from_str("03dea3b69c").unwrap(),
+                    max_priority_fee_per_gas: U256::from_str("0").unwrap(),
+                    data: hex::decode("095ea7b30000000000000000000000008a42d311d282bfcaa5133b2de0a8bcdbecea3073ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
+                    nonce: U64::from(0x0),
+                    value: U256::from_str("0").unwrap(),
+                    to: Address::from_str("dac17f958d2ee523a2206206994597c13d831ec7").unwrap(),
+                    transaction_type: TransactionType::Legacy,
+                    access_list: vec![],
+                    chain_id: U64::from(1),
+                },
+                signature: Signature {
+                    v: U64::from(38),
+                    r: U256::from_str("5327baacf5a3ae6523c6e6ebaa0cd8f98a8ac513c1baed06ec4811b1cfd979").unwrap(),
+                    s: U256::from_str("4e4a4714104d70a6f6b91e80846ff8864aa5343e3afcd9ec59683fb011059cfb").unwrap(),
+                },
+            },
+            ];
+
+        for i in 0..inputs.len() {
+            assert_eq!(signed_transactions[i].raw().to_hex(), inputs[i],);
+            assert_eq!(signed_transactions[i].hash().to_hex(), hashs[i],);
+        }
+    }
+}
diff --git a/token-core/tcx-eth2/Cargo.toml b/token-core/tcx-eth2/Cargo.toml
index 7e6fa896..1a48679f 100644
--- a/token-core/tcx-eth2/Cargo.toml
+++ b/token-core/tcx-eth2/Cargo.toml
@@ -7,18 +7,20 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tcx-chain = { path = "../tcx-chain" }
+tcx-common = { path = "../tcx-common" }
+tcx-keystore = { path = "../tcx-keystore" }
 tcx-constants = { path = "../tcx-constants" }
 tcx-primitive = { path = "../tcx-primitive" }
 tcx-crypto = { path = "../tcx-crypto" }
+tcx-eth = { path = "../tcx-eth" }
 
-hex = "0.3.1"
-prost = "0.11.2"
-bytes = "1.3.0"
-lazy_static = "1.4.0"
-prost-types = "0.11.2"
-failure = "0.1.8"
-regex = "1.7.0"
-keccak-hash = "0.10.0"
-ssz_rs = "0.8.0"
-ssz_rs_derive = "0.8.0"
\ No newline at end of file
+prost = "=0.11.2"
+bytes = "=1.4.0"
+lazy_static = "=1.4.0"
+prost-types = "=0.11.2"
+anyhow = { version = "=1.0.79", features = [] }
+regex = "=1.9.3"
+keccak-hash = "=0.10.0"
+ssz_rs = "=0.8.0"
+ssz_rs_derive = "=0.8.0"
+thiserror = "=1.0.56"
diff --git a/token-core/tcx-eth2/src/address.rs b/token-core/tcx-eth2/src/address.rs
deleted file mode 100644
index dc3b5adc..00000000
--- a/token-core/tcx-eth2/src/address.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use tcx_chain::Address;
-use tcx_chain::Result;
-use tcx_constants::CoinInfo;
-use tcx_primitive::TypedPublicKey;
-
-pub struct Eth2Address();
-
-impl Address for Eth2Address {
-    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<String> {
-        let public_key_str = hex::encode(public_key.to_bytes());
-        Ok(public_key_str)
-    }
-
-    fn is_valid(address: &str, _coin: &CoinInfo) -> bool {
-        if address.is_empty() {
-            return false;
-        };
-        if address.starts_with("0x") {
-            if address.len() != 98 {
-                return false;
-            };
-        } else {
-            if address.len() != 96 {
-                return false;
-            };
-        };
-        true
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::address::Eth2Address;
-    use tcx_chain::Address;
-    use tcx_constants::{CoinInfo, CurveType};
-
-    #[test]
-    fn is_valid_test() {
-        let coin_info = CoinInfo {
-            coin: "ETHEREUM2".to_string(),
-            derivation_path: "".to_string(),
-            curve: CurveType::BLS,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
-        };
-        let address = "0xb809eea8f4c1935fa6c0cc6d454a5b297c7856da4df4da96432ea2ef6fa86abf90f8553aaf8c6d605c94244d68d62eb8";
-        let valid_result = Eth2Address::is_valid(address, &coin_info);
-        assert!(valid_result);
-
-        let address = "b809eea8f4c1935fa6c0cc6d454a5b297c7856da4df4da96432ea2ef6fa86abf90f8553aaf8c6d605c94244d68d62eb8";
-        let valid_result = Eth2Address::is_valid(address, &coin_info);
-        assert!(valid_result);
-
-        let address = "";
-        let valid_result = Eth2Address::is_valid(address, &coin_info);
-        assert_eq!(false, valid_result);
-
-        let address = "b809eea8f4c1935fa6c0cc6d454a5b297c7856da4df4da96432ea2ef6fa86abf";
-        let valid_result = Eth2Address::is_valid(address, &coin_info);
-        assert_eq!(false, valid_result);
-
-        let address = "b809eea8f4c1935fa6c0cc6d454a5b297c7856da4df4da96432ea2ef6fa86abf90f8553aaf8c6d605c94244d68d62eb8b809eea8f4c1935fa6c0cc6d454a5b297c7856da4df4da96432ea2ef6fa86abf";
-        let valid_result = Eth2Address::is_valid(address, &coin_info);
-        assert_eq!(false, valid_result);
-    }
-}
diff --git a/token-core/tcx-eth2/src/bls_to_execution_change.rs b/token-core/tcx-eth2/src/bls_to_execution_change.rs
index be15f3bf..3154137f 100644
--- a/token-core/tcx-eth2/src/bls_to_execution_change.rs
+++ b/token-core/tcx-eth2/src/bls_to_execution_change.rs
@@ -1,10 +1,8 @@
-use crate::hex_to_bytes;
 use lazy_static::lazy_static;
 use ssz_rs::prelude::*;
 use ssz_rs::{Node, Vector};
-use std::collections::HashMap;
-use std::convert::{TryFrom, TryInto};
-use std::str::FromStr;
+use std::convert::TryFrom;
+use tcx_common::FromHex;
 
 const DOMAIN_LEN: usize = 32;
 const DOMAIN_TYPE_LEN: usize = 4;
@@ -24,10 +22,10 @@ lazy_static! {
 
 impl BLSToExecutionRequest {
     pub fn generate_bls_to_execution_change_hash(&self) -> tcx_constants::Result<String> {
-        let to_execution_address_bytes = hex_to_bytes(&self.to_execution_address)?;
+        let to_execution_address_bytes = Vec::from_hex_auto(&self.to_execution_address)?;
         let to_execution_address =
             Vector::<u8, EXECUTION_ADDR_LEN>::deserialize(to_execution_address_bytes.as_ref())?;
-        let from_bls_pubkey_bytes = hex_to_bytes(&self.from_bls_pubkey)?;
+        let from_bls_pubkey_bytes = Vec::from_hex_auto(&self.from_bls_pubkey)?;
         let from_bls_pubkey =
             Vector::<u8, BLS_PUBKEY_LEN>::deserialize(from_bls_pubkey_bytes.as_ref())?;
         let validator_index = self.validator_index;
@@ -38,16 +36,16 @@ impl BLSToExecutionRequest {
         };
 
         let fork_version = Vector::<u8, DOMAIN_TYPE_LEN>::deserialize(
-            hex_to_bytes(&self.genesis_fork_version)?.as_slice(),
+            Vec::from_hex_auto(&self.genesis_fork_version)?.as_slice(),
         )?;
         let validator_root =
-            Node::try_from(hex_to_bytes(&self.genesis_validators_root)?.as_slice())?;
+            Node::try_from(Vec::from_hex_auto(&self.genesis_validators_root)?.as_slice())?;
         let domain = compute_domain(
             &DOMAIN_BLS_TO_EXECUTION_CHANGE,
             fork_version,
             &validator_root,
         )?;
-        let signing_root = compute_signing_root(message.clone(), domain)?;
+        let signing_root = compute_signing_root(message, domain)?;
         let message = format!("{:x}", signing_root);
         Ok(message)
     }
@@ -118,19 +116,17 @@ pub struct BLSToExecutionRequest {
 #[cfg(test)]
 mod test {
     use crate::bls_to_execution_change::BLSToExecutionRequest;
-    use crate::transaction::SignBlsToExecutionChangeParam;
-    use tcx_chain::Keystore;
 
     #[test]
     fn test_generate_bls_to_execution_change_hash() {
-        let mut blsToExecutionRequest = BLSToExecutionRequest {
+        let bls_to_execution_request = BLSToExecutionRequest {
             genesis_fork_version: "0x03000000".to_string(),
             genesis_validators_root: "0x4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95".to_string(),
             validator_index: 0,
             from_bls_pubkey: "0x99b1f1d84d76185466d86c34bde1101316afddae76217aa86cd066979b19858c2c9d9e56eebc1e067ac54277a61790db".to_string(),
             to_execution_address: "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15".to_string(),
         };
-        let ret_data = blsToExecutionRequest
+        let ret_data = bls_to_execution_request
             .generate_bls_to_execution_change_hash()
             .expect("generate_bls_to_execution_change_hash_error");
         assert_eq!(
diff --git a/token-core/tcx-eth2/src/lib.rs b/token-core/tcx-eth2/src/lib.rs
index 307b5efb..29a403e7 100644
--- a/token-core/tcx-eth2/src/lib.rs
+++ b/token-core/tcx-eth2/src/lib.rs
@@ -1,25 +1,23 @@
 extern crate core;
 
-pub mod address;
 mod bls_to_execution_change;
 pub mod signer;
 pub mod transaction;
-use failure::Fail;
-use tcx_chain::Result;
+use crate::transaction::sign_bls_to_execution_change_param::Key;
 
-#[derive(Fail, Debug, PartialEq)]
-pub enum Error {
-    #[fail(display = "invalid_hex_value")]
-    InvalidHexValue,
-    #[fail(display = "invalid_eth_address")]
-    InvalidEthAddress,
+use thiserror::Error;
+
+impl From<Key> for tcx_crypto::Key {
+    fn from(key: Key) -> Self {
+        match key {
+            Key::Password(password) => Self::Password(password),
+            Key::DerivedKey(derived_key) => Self::DerivedKey(derived_key),
+        }
+    }
 }
 
-pub fn hex_to_bytes(value: &str) -> Result<Vec<u8>> {
-    let result = if value.starts_with("0x") || value.starts_with("0X") {
-        hex::decode(&value[2..])
-    } else {
-        hex::decode(&value[..])
-    };
-    result.map_err(|_| Error::InvalidHexValue.into())
+#[derive(Error, Debug, PartialEq)]
+pub enum Error {
+    #[error("invalid_eth_address")]
+    InvalidEthAddress,
 }
diff --git a/token-core/tcx-eth2/src/signer.rs b/token-core/tcx-eth2/src/signer.rs
index 20aaa788..c9249bbf 100644
--- a/token-core/tcx-eth2/src/signer.rs
+++ b/token-core/tcx-eth2/src/signer.rs
@@ -1,27 +1,26 @@
-use crate::bls_to_execution_change::{compute_domain, BLSToExecutionRequest};
+use crate::bls_to_execution_change::BLSToExecutionRequest;
 use crate::transaction::{
     BlsToExecutionChangeMessage, SignBlsToExecutionChangeParam, SignBlsToExecutionChangeResult,
     SignedBlsToExecutionChange,
 };
-use crate::{hex_to_bytes, Error, Result};
-use keccak_hash;
-use regex::Regex;
-use ssz_rs::{Deserialize, Vector};
-use tcx_chain::{
-    ChainSigner, Keystore, KeystoreGuard, TransactionSigner as TraitTransactionSigner,
-};
+use crate::Error;
+use tcx_common::{FromHex, ToHex};
+use tcx_constants::CoinInfo;
+use tcx_eth::address::EthAddress;
+use tcx_keystore::{Address, Keystore, Result, Signer};
 
 impl SignBlsToExecutionChangeParam {
     pub fn sign_bls_to_execution_change(
         &self,
         keystore: &mut Keystore,
     ) -> Result<SignBlsToExecutionChangeResult> {
-        let valid_result = is_valid_address(self.eth1_withdrawal_address.as_str())?;
+        let valid_result =
+            EthAddress::is_valid(self.eth1_withdrawal_address.as_str(), &CoinInfo::default());
         if !valid_result {
             return Err(Error::InvalidEthAddress.into());
         }
 
-        let mut blsToExecutionRequest = BLSToExecutionRequest {
+        let mut bls_to_execution_request = BLSToExecutionRequest {
             genesis_fork_version: self.genesis_fork_version.to_string(),
             genesis_validators_root: self.genesis_validators_root.to_string(),
             validator_index: 0,
@@ -30,94 +29,25 @@ impl SignBlsToExecutionChangeParam {
         };
         let mut signeds = vec![];
         for validator_index in &self.validator_index {
-            blsToExecutionRequest.validator_index = *validator_index;
-            let message = blsToExecutionRequest.generate_bls_to_execution_change_hash()?;
+            bls_to_execution_request.validator_index = *validator_index;
+            let message = bls_to_execution_request.generate_bls_to_execution_change_hash()?;
 
-            let signature = keystore.sign_specified_hash(
-                hex::decode(message)?.as_slice(),
-                "ETHEREUM2",
-                self.from_bls_pub_key.as_str(),
-                None,
+            let signature = keystore.bls_sign(
+                Vec::from_hex_auto(&message)?.as_slice(),
+                "m/12381/3600/0/0",
                 "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_",
             )?;
-            let blsToExecutionChangeMessage = BlsToExecutionChangeMessage {
+            let bls_to_execution_change_message = BlsToExecutionChangeMessage {
                 validator_index: *validator_index,
                 from_bls_pubkey: self.from_bls_pub_key.to_string(),
                 to_execution_address: self.eth1_withdrawal_address.to_string(),
             };
-            let signedBlsToExecutionChange = SignedBlsToExecutionChange {
-                message: Some(blsToExecutionChangeMessage),
-                signature: hex::encode(signature),
-            };
-            signeds.push(signedBlsToExecutionChange);
-        }
-
-        let signBlsToExecutionChangeResult = SignBlsToExecutionChangeResult { signeds };
-        Ok(signBlsToExecutionChangeResult)
-    }
-}
-
-fn is_valid_address(address: &str) -> Result<bool> {
-    if address.is_empty() || address.len() != 42 || !address.starts_with("0x") {
-        return Ok(false);
-    }
-
-    let ethAddrRegex = Regex::new(r"^(0x)?[0-9a-fA-F]{40}$").unwrap();
-    if !ethAddrRegex.is_match(address.as_ref()) {
-        return Ok(false);
-    }
-
-    let address_temp = &address[2..];
-    let lower_address_bytes = address_temp.to_lowercase();
-    let mut hash = [0u8; 32];
-    keccak_hash::keccak_256(lower_address_bytes.as_bytes(), &mut hash);
-    let hash_str = hex::encode(hash);
-
-    for (i, c) in address_temp.chars().enumerate() {
-        let char_int = u8::from_str_radix(&hash_str.chars().nth(i).unwrap().to_string(), 16)?;
-        if (c.is_uppercase() && char_int <= 7) || (c.is_lowercase() && char_int > 7) {
-            return Ok(false);
+            signeds.push(SignedBlsToExecutionChange {
+                message: Some(bls_to_execution_change_message),
+                signature: signature.to_hex(),
+            });
         }
-    }
-    Ok(true)
-}
-
-#[cfg(test)]
-mod test {
-    use crate::signer::is_valid_address;
-
-    #[test]
-    fn test_is_valid_address() {
-        let eth_address = "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(true, result);
-
-        let eth_address = "0x52908400098527886E0F7030069857D2E4169EE7";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(true, result);
-
-        let eth_address = "0xde709f2102306220921060314715629080e2fb77";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(true, result);
-
-        let eth_address = "0x8C1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(false, result);
-
-        let eth_address = "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac1500";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(false, result);
-
-        let eth_address = "8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(false, result);
-
-        let eth_address = "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac1*";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(false, result);
 
-        let eth_address = "0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb";
-        let result = is_valid_address(eth_address).unwrap();
-        assert_eq!(true, result);
+        Ok(SignBlsToExecutionChangeResult { signeds })
     }
 }
diff --git a/token-core/tcx-eth2/src/transaction.rs b/token-core/tcx-eth2/src/transaction.rs
index 73645a7d..f3347fe7 100644
--- a/token-core/tcx-eth2/src/transaction.rs
+++ b/token-core/tcx-eth2/src/transaction.rs
@@ -3,18 +3,29 @@
 pub struct SignBlsToExecutionChangeParam {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub password: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub genesis_fork_version: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
+    pub genesis_fork_version: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
     pub genesis_validators_root: ::prost::alloc::string::String,
-    #[prost(uint32, repeated, tag = "5")]
+    #[prost(uint32, repeated, tag = "6")]
     pub validator_index: ::prost::alloc::vec::Vec<u32>,
-    #[prost(string, tag = "6")]
-    pub from_bls_pub_key: ::prost::alloc::string::String,
     #[prost(string, tag = "7")]
+    pub from_bls_pub_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "8")]
     pub eth1_withdrawal_address: ::prost::alloc::string::String,
+    #[prost(oneof = "sign_bls_to_execution_change_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<sign_bls_to_execution_change_param::Key>,
+}
+/// Nested message and enum types in `SignBLSToExecutionChangeParam`.
+pub mod sign_bls_to_execution_change_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/token-core/tcx-examples/RN/e2e/specs/wallet/base/importMnemonic.js b/token-core/tcx-examples/RN/e2e/specs/wallet/base/importMnemonic.js
index f8859600..727cd90e 100644
--- a/token-core/tcx-examples/RN/e2e/specs/wallet/base/importMnemonic.js
+++ b/token-core/tcx-examples/RN/e2e/specs/wallet/base/importMnemonic.js
@@ -47,7 +47,7 @@ export default async function (params) {
   await waitFor(id('expected-mnemonic')).toExist().withTimeout(2000)
   await toHaveText('expected-mnemonic', mnemonic)
 
-  // keystore
+  // fixtures
   await id('keystoreCommonVerify').tap()
   await waitFor(id('verifySuccess')).toExist().withTimeout(2000)
 
diff --git a/token-core/tcx-examples/RN/e2e/specs/wallet/base/importPrivateKey.js b/token-core/tcx-examples/RN/e2e/specs/wallet/base/importPrivateKey.js
index 92b3f9fe..397ee333 100644
--- a/token-core/tcx-examples/RN/e2e/specs/wallet/base/importPrivateKey.js
+++ b/token-core/tcx-examples/RN/e2e/specs/wallet/base/importPrivateKey.js
@@ -47,7 +47,7 @@ export default async function (params) {
   await waitFor(id('export-privateKey')).toExist().withTimeout(2000)
   await toHaveText('export-privateKey', privateKey)
 
-  // keystore
+  // fixtures
   await id('keystoreCommonVerify').tap()
   await waitFor(id('verifySuccess')).toExist().withTimeout(2000)
 
diff --git a/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicFlow.js b/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicFlow.js
index 5e6197e6..61c3cbf8 100644
--- a/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicFlow.js
+++ b/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicFlow.js
@@ -1,7 +1,7 @@
 /**
  * mnemonic flow test
  *
- * import -> export -> repeat import -> verify keystore -> delete
+ * import -> export -> repeat import -> verify fixtures -> delete
  */
 
 import importMnemonic from './base/importMnemonic'
diff --git a/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicPrivateKeyFlow.js b/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicPrivateKeyFlow.js
index c6e8086c..4746f954 100644
--- a/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicPrivateKeyFlow.js
+++ b/token-core/tcx-examples/RN/e2e/specs/wallet/mnemonicPrivateKeyFlow.js
@@ -1,8 +1,8 @@
 /**
  * menmonic cover privateKey flow test
  *
- * 1.import privateKey -> import mnemonic -> verify keystore -> detele
- * 2.import mnemonic -> import privateKey -> verify keystore -> detele
+ * 1.import privateKey -> import mnemonic -> verify fixtures -> detele
+ * 2.import mnemonic -> import privateKey -> verify fixtures -> detele
  */
 
 import mnemonicPrivateKey from './base/mnemonicPrivateKey'
diff --git a/token-core/tcx-examples/RN/e2e/specs/wallet/privateKeyFlow.js b/token-core/tcx-examples/RN/e2e/specs/wallet/privateKeyFlow.js
index c8a9b5d1..1336b19e 100644
--- a/token-core/tcx-examples/RN/e2e/specs/wallet/privateKeyFlow.js
+++ b/token-core/tcx-examples/RN/e2e/specs/wallet/privateKeyFlow.js
@@ -1,7 +1,7 @@
 /**
  * privateKey flow test
  *
- * import -> export -> repeat import -> verify keystore -> delete
+ * import -> export -> repeat import -> verify fixtures -> delete
  */
 
 import importPrivateKey from './base/importPrivateKey'
diff --git a/token-core/tcx-examples/RN/ios/RN/Api.pbobjc.h b/token-core/tcx-examples/RN/ios/RN/Api.pbobjc.h
index 535ca5ae..b367f75f 100644
--- a/token-core/tcx-examples/RN/ios/RN/Api.pbobjc.h
+++ b/token-core/tcx-examples/RN/ios/RN/Api.pbobjc.h
@@ -100,7 +100,7 @@ typedef GPB_ENUM(InitTokenCoreXParam_FieldNumber) {
 /**
  * FUNCTION: init_token_core_x(InitTokenCoreXParam)
  *
- * initialize tcx by passing keystore folder and xpub encryption params
+ * initialize tcx by passing fixtures folder and xpub encryption params
  **/
 GPB_FINAL @interface InitTokenCoreXParam : GPBMessage
 
@@ -129,7 +129,7 @@ typedef GPB_ENUM(ExportPrivateKeyParam_FieldNumber) {
  *
  * // FUNCTION: export_private_key(ExportPrivateKeyParam): KeystoreCommonExportResult
  * //
- * // export the private key from a private key keystore or a hd keystore
+ * // export the private key from a private key fixtures or a hd fixtures
  **/
 GPB_FINAL @interface ExportPrivateKeyParam : GPBMessage
 
@@ -160,7 +160,7 @@ typedef GPB_ENUM(WalletKeyParam_FieldNumber) {
  *
  * // FUNCTION: keystore_common_verify(WalletKeyParam) -> Response
  * //
- * // verify the password of the keystore
+ * // verify the password of the fixtures
  **/
 GPB_FINAL @interface WalletKeyParam : GPBMessage
 
diff --git a/token-core/tcx-examples/RN/ios/RN/Params.pbobjc.h b/token-core/tcx-examples/RN/ios/RN/Params.pbobjc.h
index fd7fc604..15eee874 100644
--- a/token-core/tcx-examples/RN/ios/RN/Params.pbobjc.h
+++ b/token-core/tcx-examples/RN/ios/RN/Params.pbobjc.h
@@ -82,7 +82,7 @@ typedef GPB_ENUM(HdStoreCreateParam_FieldNumber) {
 /**
  * FUNCTION: hd_store_create(HdStoreCreateParam): WalletResult
  *
- * create a new hd keystore
+ * create a new hd fixtures
  **/
 GPB_FINAL @interface HdStoreCreateParam : GPBMessage
 
@@ -134,7 +134,7 @@ typedef GPB_ENUM(HdStoreImportParam_FieldNumber) {
 /**
  * FUNCTION: hd_store_import(HdStoreImportParam): WalletResult
  *
- * create a new hd keystore by mnemonic
+ * create a new hd fixtures by mnemonic
  **/
 GPB_FINAL @interface HdStoreImportParam : GPBMessage
 
@@ -163,7 +163,7 @@ typedef GPB_ENUM(KeystoreCommonDeriveParam_FieldNumber) {
 /**
  * FUNCTION: hd_store_derive(HdStoreDeriveParam): AccountsResponse
  *
- * derive new accounts from a hd keystore
+ * derive new accounts from a hd fixtures
  **/
 GPB_FINAL @interface KeystoreCommonDeriveParam : GPBMessage
 
@@ -247,7 +247,7 @@ typedef GPB_ENUM(KeystoreCommonExportResult_FieldNumber) {
 /**
  * FUNCTION: hd_store_export(KeystoreCommonExportResult): KeystoreCommonExistsResult
  *
- * export the mnemonic from a hd keystore
+ * export the mnemonic from a hd fixtures
  **/
 GPB_FINAL @interface KeystoreCommonExportResult : GPBMessage
 
@@ -282,7 +282,7 @@ typedef GPB_ENUM(PrivateKeyStoreImportParam_FieldNumber) {
 /**
  * FUNCTION: private_key_store_import(PrivateKeyStoreImportParam): WalletResult
  *
- * create a new private key keystore by a private key
+ * create a new private key fixtures by a private key
  **/
 GPB_FINAL @interface PrivateKeyStoreImportParam : GPBMessage
 
@@ -306,7 +306,7 @@ typedef GPB_ENUM(PrivateKeyStoreExportParam_FieldNumber) {
 /**
  * FUNCTION: private_key_store_export(PrivateKeyStoreExportParam): KeystoreCommonExportResult
  *
- * export the private key from a private key keystore
+ * export the private key from a private key fixtures
  **/
 GPB_FINAL @interface PrivateKeyStoreExportParam : GPBMessage
 
@@ -330,7 +330,7 @@ typedef GPB_ENUM(KeystoreCommonExistsParam_FieldNumber) {
 /**
  * FUNCTION: keystore_common_exists(KeystoreCommonExistsParam): KeystoreCommonExistsResult
  *
- * Check is there a keystore was generate by the special privateKey or mnemonic
+ * Check is there a fixtures was generate by the special privateKey or mnemonic
  **/
 GPB_FINAL @interface KeystoreCommonExistsParam : GPBMessage
 
@@ -376,7 +376,7 @@ typedef GPB_ENUM(KeystoreCommonAccountsParam_FieldNumber) {
 /**
  * FUNCTION: keystore_common_accounts(KeystoreCommonAccountsParam): AccountsResponse
  *
- * List all accounts from the keystore
+ * List all accounts from the fixtures
  **/
 GPB_FINAL @interface KeystoreCommonAccountsParam : GPBMessage
 
diff --git a/token-core/tcx-examples/RN/ios/RN/api.proto b/token-core/tcx-examples/RN/ios/RN/api.proto
index 85fa040f..160cfc2b 100644
--- a/token-core/tcx-examples/RN/ios/RN/api.proto
+++ b/token-core/tcx-examples/RN/ios/RN/api.proto
@@ -14,7 +14,7 @@ message TcxAction {
 }
 
 // A common response when error occurred.
-message Response {
+message GeneralResult {
     bool isSuccess = 1;
     string error = 2;
 }
@@ -32,7 +32,7 @@ message InitTokenCoreXParam {
 }
 
 //
-//// FUNCTION: export_private_key(ExportPrivateKeyParam): KeystoreCommonExportResult
+//// FUNCTION: export_private_key(ExportPrivateKeyParam): ExportResult
 ////
 //// export the private key from a private key keystore or a hd keystore
 message ExportPrivateKeyParam {
@@ -40,13 +40,13 @@ message ExportPrivateKeyParam {
     string password = 2;
     string chainType = 3;
     string network = 4;
-    string mainAddress = 5;
+    string curve = 5;
     string path = 6;
 }
 //
 ///// Keystore Common
 //
-//// FUNCTION: keystore_common_verify(WalletKeyParam) -> Response
+//// FUNCTION: verify_password(WalletKeyParam) -> Response
 ////
 //// verify the password of the keystore
 message WalletKeyParam {
diff --git a/token-core/tcx-examples/RN/ios/RN/params.proto b/token-core/tcx-examples/RN/ios/RN/params.proto
index a9787fbc..b1771930 100644
--- a/token-core/tcx-examples/RN/ios/RN/params.proto
+++ b/token-core/tcx-examples/RN/ios/RN/params.proto
@@ -5,16 +5,16 @@ import "google/protobuf/any.proto";
 
 /// Hd Store
 
-// FUNCTION: hd_store_create(HdStoreCreateParam): WalletResult
+// FUNCTION: create_keystore(CreateKeystoreParam): KeystoreResult
 //
 // create a new hd keystore
-message HdStoreCreateParam {
+message CreateKeystoreParam {
     string password = 1;
     string passwordHint = 2;
     string name = 3;
 }
 
-message WalletResult {
+message KeystoreResult {
     string id = 1;
     string name = 2;
     string source = 3;
@@ -22,10 +22,10 @@ message WalletResult {
     int64 createdAt = 5;
 }
 
-// FUNCTION: hd_store_import(HdStoreImportParam): WalletResult
+// FUNCTION: import_mnemonic(ImportMnemonicParam): KeystoreResult
 //
 // create a new hd keystore by mnemonic
-message HdStoreImportParam {
+message ImportMnemonicParam {
     string mnemonic = 1;
     string password = 2;
     string source = 3;
@@ -34,10 +34,10 @@ message HdStoreImportParam {
     bool overwrite = 6;
 }
 
-// FUNCTION: hd_store_derive(HdStoreDeriveParam): AccountsResponse
+// FUNCTION: hd_store_derive(HdStoreDeriveParam): DeriveAccountsResult
 //
 // derive new accounts from a hd keystore
-message KeystoreCommonDeriveParam {
+message DeriveAccountsParam {
     string id = 1;
     string password = 2;
     message Derivation {
@@ -57,14 +57,11 @@ message AccountResponse {
     string extendedXpubKey = 4;
 }
 
-message AccountsResponse {
+message DeriveAccountsResult {
     repeated AccountResponse accounts = 1;
 }
 
-// FUNCTION: hd_store_export(KeystoreCommonExportResult): KeystoreCommonExistsResult
-//
-// export the mnemonic from a hd keystore
-message KeystoreCommonExportResult {
+message ExportResult {
     string id = 1;
     KeyType type = 2;
     string value = 3;
@@ -78,16 +75,16 @@ enum KeyType {
 
 /// Private Key Store
 
-// FUNCTION: private_key_store_import(PrivateKeyStoreImportParam): WalletResult
+// FUNCTION: import_private_key(ImportPrivateKeyParam): KeystoreResult
 //
 // create a new private key keystore by a private key
-message PrivateKeyStoreImportParam {
+message ImportPrivateKeyParam {
     string privateKey = 1;
     string password = 2;
     bool overwrite = 3;
 }
 
-// FUNCTION: private_key_store_export(PrivateKeyStoreExportParam): KeystoreCommonExportResult
+// FUNCTION: private_key_store_export(PrivateKeyStoreExportParam): ExportResult
 //
 // export the private key from a private key keystore
 message PrivateKeyStoreExportParam {
@@ -99,24 +96,22 @@ message PrivateKeyStoreExportParam {
 
 /// Keystore Common
 
-// FUNCTION: keystore_common_delete(WalletKeyParam) -> Response
+// FUNCTION: delete_keystore(WalletKeyParam) -> Response
 //
 // delete the keystore
 
-// FUNCTION: keystore_common_exists(KeystoreCommonExistsParam): KeystoreCommonExistsResult
-//
 // Check is there a keystore was generate by the special privateKey or mnemonic
 message KeystoreCommonExistsParam {
     KeyType type = 1;
     string value = 2;
 }
 
-message KeystoreCommonExistsResult {
+message ExistsKeystoreResult {
     bool isExists = 1;
     string id = 2;
 }
 
-// FUNCTION: keystore_common_accounts(KeystoreCommonAccountsParam): AccountsResponse
+// FUNCTION: keystore_common_accounts(KeystoreCommonAccountsParam): DeriveAccountsResult
 //
 // List all accounts from the keystore
 message KeystoreCommonAccountsParam{
diff --git a/token-core/tcx-examples/RN/src/native/proto.d.ts b/token-core/tcx-examples/RN/src/native/proto.d.ts
index 6cdf6a00..fc9c843b 100644
--- a/token-core/tcx-examples/RN/src/native/proto.d.ts
+++ b/token-core/tcx-examples/RN/src/native/proto.d.ts
@@ -324,7 +324,7 @@ export namespace api {
         path?: (string|null);
     }
 
-    /** export the private key from a private key keystore or a hd keystore */
+    /** export the private key from a private key fixtures or a hd fixtures */
     class ExportPrivateKeyParam implements IExportPrivateKeyParam {
 
         /**
@@ -432,7 +432,7 @@ export namespace api {
         password?: (string|null);
     }
 
-    /** verify the password of the keystore */
+    /** verify the password of the fixtures */
     class WalletKeyParam implements IWalletKeyParam {
 
         /**
diff --git a/token-core/tcx-examples/RN/src/native/proto.js b/token-core/tcx-examples/RN/src/native/proto.js
index f635a347..c93cdc7d 100644
--- a/token-core/tcx-examples/RN/src/native/proto.js
+++ b/token-core/tcx-examples/RN/src/native/proto.js
@@ -714,7 +714,7 @@ $root.api = (function() {
         /**
          * Constructs a new ExportPrivateKeyParam.
          * @memberof api
-         * @classdesc export the private key from a private key keystore or a hd keystore
+         * @classdesc export the private key from a private key fixtures or a hd fixtures
          * @implements IExportPrivateKeyParam
          * @constructor
          * @param {api.IExportPrivateKeyParam=} [properties] Properties to set
@@ -1008,7 +1008,7 @@ $root.api = (function() {
         /**
          * Constructs a new WalletKeyParam.
          * @memberof api
-         * @classdesc verify the password of the keystore
+         * @classdesc verify the password of the fixtures
          * @implements IWalletKeyParam
          * @constructor
          * @param {api.IWalletKeyParam=} [properties] Properties to set
diff --git a/token-core/tcx-examples/android/.gitignore b/token-core/tcx-examples/android/.gitignore
index 3a2ecdb5..d31ced7c 100644
--- a/token-core/tcx-examples/android/.gitignore
+++ b/token-core/tcx-examples/android/.gitignore
@@ -49,9 +49,9 @@ captures/
 .idea/navEditor.xml
 
 # Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
+# Uncomment the following lines if you do not want to check your fixtures files in.
 #*.jks
-#*.keystore
+#*.fixtures
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
diff --git a/token-core/tcx-examples/iOSExample/iOSExample/Proto/api.proto b/token-core/tcx-examples/iOSExample/iOSExample/Proto/api.proto
index a19bf230..391e9d53 100644
--- a/token-core/tcx-examples/iOSExample/iOSExample/Proto/api.proto
+++ b/token-core/tcx-examples/iOSExample/iOSExample/Proto/api.proto
@@ -9,7 +9,7 @@ message TcxAction {
 }
 
 
-message Response {
+message GeneralResult {
     bool isSuccess = 1;
     string error = 2;
 }
\ No newline at end of file
diff --git a/token-core/tcx-examples/iOSExample/iOSExample/Proto/api_params.proto b/token-core/tcx-examples/iOSExample/iOSExample/Proto/api_params.proto
index ce5472c5..549760a8 100644
--- a/token-core/tcx-examples/iOSExample/iOSExample/Proto/api_params.proto
+++ b/token-core/tcx-examples/iOSExample/iOSExample/Proto/api_params.proto
@@ -10,14 +10,14 @@ message InitTokenCoreXParam {
 }
 
 /// Hd Store
-message HdStoreCreateParam {
+message CreateKeystoreParam {
     string password = 1;
     string passwordHint = 2;
     string name = 3;
 }
 
 
-message HdStoreImportParam {
+message ImportMnemonicParam {
     string chainType = 1;
     string mnemonic = 2;
     string password = 3;
@@ -57,7 +57,7 @@ message AccountResponse {
     string extendedXpubKey = 4;
 }
 
-message AccountsResponse {
+message DeriveAccountsResult {
     repeated AccountResponse accounts = 1;
 }
 
@@ -77,7 +77,7 @@ message KeystoreCommonAccountsParam{
 }
 
 /// Private key store
-message PrivateKeyStoreImportParam {
+message ImportPrivateKeyParam {
     string privateKey = 1;
     string password = 2;
     string chainType = 3;
@@ -106,7 +106,7 @@ message KeystoreCommonExistsParam {
     string value = 2;
 }
 
-message KeystoreCommonExportResult {
+message ExportResult {
     string id = 1;
     KeyType type = 2;
     string value = 3;
@@ -117,7 +117,7 @@ enum KeyType {
     PRIVATE_KEY = 1;
 }
 
-message KeystoreCommonExistsResult {
+message ExistsKeystoreResult {
     bool isExists = 1;
     string id = 2;
 }
@@ -131,7 +131,7 @@ message SignParam {
     google.protobuf.Any input = 5;
 }
 
-message WalletResult {
+message KeystoreResult {
     string id = 1;
     string name = 2;
     string source = 3;
diff --git a/token-core/tcx-filecoin/Cargo.toml b/token-core/tcx-filecoin/Cargo.toml
index 51a99df5..663c58c7 100644
--- a/token-core/tcx-filecoin/Cargo.toml
+++ b/token-core/tcx-filecoin/Cargo.toml
@@ -2,36 +2,31 @@
 name = "tcx-filecoin"
 version = "0.1.0"
 authors = ["tyrone <2125081@qq.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 tcx-crypto = { path = "../tcx-crypto" }
-tcx-chain = { path = "../tcx-chain" }
+tcx-keystore = { path = "../tcx-keystore" }
 tcx-primitive = { path = "../tcx-primitive" }
 tcx-constants = { path = "../tcx-constants" }
+tcx-common = { path = "../tcx-common" }
 
-prost = "0.11.2"
-bytes = "1.3.0"
-blake2b-rs = "0.2.0"
-failure = "0.1.8"
-byteorder = "1.4.3"
-base32 = "^0.4.0"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_cbor = "0.11.1"
-serde_json = "1.0.88"
-base64 = "0.13.1"
-
-num_bigint_chainsafe = { package = "forest_bigint", version = "0.1.0"}
-
-
-hex = "0.4.3"
-lazy_static = "1.4.0"
-
-forest_vm = "0.3.2"
-forest_message = "0.7.2"
-forest_address = "0.3.2"
-forest_encoding = "0.2.2"
-forest_cid = "0.3.0"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+blake2b-rs = "=0.2.0"
+anyhow = { version = "=1.0.79", features = [] }
+byteorder = "=1.4.3"
+base32 = "=0.4.0"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+base64 = "=0.13.1"
+lazy_static = "=1.4.0"
+forest_vm = "=0.3.2"
+forest_message = "=0.7.2"
+forest_address = "=0.3.2"
+forest_encoding = "=0.2.2"
+forest_cid = "=0.3.0"
 forest_crypto = "0.5.3"
+thiserror = "=1.0.56"
diff --git a/token-core/tcx-filecoin/src/address.rs b/token-core/tcx-filecoin/src/address.rs
index fb15fa2a..72b8d422 100644
--- a/token-core/tcx-filecoin/src/address.rs
+++ b/token-core/tcx-filecoin/src/address.rs
@@ -1,5 +1,5 @@
-use tcx_chain::{Address, Result};
 use tcx_constants::CoinInfo;
+use tcx_keystore::{Address, Result};
 use tcx_primitive::{PublicKey, TypedPublicKey};
 
 use forest_address::Address as ForestAddress;
@@ -9,16 +9,17 @@ use crate::utils::{digest, HashSize};
 use base32::Alphabet;
 use std::str::FromStr;
 
-const MAINNET_PREFIX: &'static str = "f";
-const TESTNET_PREFIX: &'static str = "t";
+const MAINNET_PREFIX: &str = "f";
+const TESTNET_PREFIX: &str = "t";
 
 #[derive(Clone, Copy)]
 pub enum Protocol {
     Secp256k1 = 1,
-    BLS = 3,
+    Bls = 3,
 }
 
-pub struct FilecoinAddress();
+#[derive(PartialEq, Eq, Clone)]
+pub struct FilecoinAddress(String);
 
 impl FilecoinAddress {
     fn checksum(ingest: &[u8]) -> Vec<u8> {
@@ -31,43 +32,43 @@ impl FilecoinAddress {
 }
 
 impl Address for FilecoinAddress {
-    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<String> {
-        let ntwk = match coin.network.as_str() {
+    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<Self> {
+        let network_prefix = match coin.network.as_str() {
             "TESTNET" => TESTNET_PREFIX,
             _ => MAINNET_PREFIX,
         };
         let protocol;
         let payload;
-        let cksm;
+        let checksum;
 
         match public_key {
             TypedPublicKey::Secp256k1(pk) => {
                 protocol = Protocol::Secp256k1;
                 payload = Self::address_hash(&pk.to_uncompressed());
 
-                cksm = Self::checksum(&[vec![protocol as u8], payload.clone().to_vec()].concat());
+                checksum = Self::checksum(&[vec![protocol as u8], payload.to_vec()].concat());
             }
             TypedPublicKey::BLS(pk) => {
-                protocol = Protocol::BLS;
+                protocol = Protocol::Bls;
                 payload = pk.to_bytes();
 
-                cksm = Self::checksum(&[vec![protocol as u8], payload.clone().to_vec()].concat());
+                checksum = Self::checksum(&[vec![protocol as u8], payload.to_vec()].concat());
             }
             _ => {
                 return Err(Error::InvalidCurveType.into());
             }
         };
 
-        Ok(format!(
+        Ok(FilecoinAddress(format!(
             "{}{}{}",
-            ntwk,
+            network_prefix,
             protocol as i8,
             base32::encode(
                 Alphabet::RFC4648 { padding: false },
-                &[payload, cksm].concat()
+                &[payload, checksum].concat()
             )
             .to_lowercase()
-        ))
+        )))
     }
 
     fn is_valid(address: &str, coin: &CoinInfo) -> bool {
@@ -84,11 +85,29 @@ impl Address for FilecoinAddress {
     }
 }
 
+impl FromStr for FilecoinAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(FilecoinAddress(s.to_string()))
+    }
+}
+
+impl ToString for FilecoinAddress {
+    fn to_string(&self) -> String {
+        self.0.clone()
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    use std::str::FromStr;
+
     use crate::address::FilecoinAddress;
-    use tcx_chain::{Address, Keystore, Metadata};
+    use crate::Error;
+    use tcx_common::FromHex;
     use tcx_constants::{coin_info_from_param, CoinInfo, CurveType};
+    use tcx_keystore::{Address, Keystore, Metadata};
     use tcx_primitive::TypedPublicKey;
 
     #[test]
@@ -152,13 +171,13 @@ mod tests {
         for (input, expected) in test_cases {
             let pk = TypedPublicKey::from_slice(CurveType::BLS, &input).unwrap();
             let address = FilecoinAddress::from_public_key(&pk, &coin_info).unwrap();
-            assert_eq!(address, expected);
+            assert_eq!(address.to_string(), expected);
         }
     }
 
     #[test]
     fn test_bip44_secp256k1() {
-        let mut coin_info = coin_info_from_param("FILECOIN", "MAINNET", "", "SECP256k1")
+        let mut coin_info = coin_info_from_param("FILECOIN", "MAINNET", "", "secp256k1")
             .unwrap()
             .clone();
 
@@ -247,7 +266,30 @@ mod tests {
         for (input, expected) in test_cases {
             let pk = TypedPublicKey::from_slice(CurveType::SECP256k1, &input).unwrap();
             let address = FilecoinAddress::from_public_key(&pk, &coin_info).unwrap();
-            assert_eq!(address, expected);
+            assert_eq!(address.to_string(), expected);
         }
     }
+
+    #[test]
+    fn test_invalid_curve_type() {
+        let input =
+            Vec::from_hex("cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc")
+                .unwrap();
+        let pk = TypedPublicKey::from_slice(CurveType::ED25519, &input).unwrap();
+        let actual = FilecoinAddress::from_public_key(&pk, &CoinInfo::default());
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::InvalidCurveType.to_string()
+        );
+    }
+
+    #[test]
+    fn test_from_str() {
+        let address =
+            FilecoinAddress::from_str("t1xtwapqc6nh4si2hcwpr3656iotzmlwumogqbuaa").unwrap();
+        assert_eq!(
+            address.to_string(),
+            "t1xtwapqc6nh4si2hcwpr3656iotzmlwumogqbuaa"
+        );
+    }
 }
diff --git a/token-core/tcx-filecoin/src/key_info.rs b/token-core/tcx-filecoin/src/key_info.rs
index a258a5bc..ae6599d1 100644
--- a/token-core/tcx-filecoin/src/key_info.rs
+++ b/token-core/tcx-filecoin/src/key_info.rs
@@ -1,16 +1,16 @@
 use serde::{Deserialize, Serialize};
-use tcx_chain::Result;
 use tcx_constants::CurveType;
+use tcx_keystore::Result;
 
 use super::Error;
 
 #[derive(Deserialize, Serialize, Debug)]
 pub struct KeyInfo {
     #[serde(rename = "Type")]
-    r#type: String,
+    pub r#type: String,
 
     #[serde(rename = "PrivateKey")]
-    private_key: String,
+    pub private_key: String,
 }
 
 impl KeyInfo {
@@ -25,6 +25,7 @@ impl KeyInfo {
                 private_key: base64::encode(private_key),
             }),
             CurveType::BLS => Ok(KeyInfo {
+                // !!! Filecoin use "bls" string as type in json
                 r#type: "bls".to_string(),
                 private_key: base64::encode(private_key),
             }),
@@ -44,30 +45,58 @@ impl KeyInfo {
 #[cfg(test)]
 mod tests {
     use super::KeyInfo;
+    use crate::Error;
+    use tcx_common::{FromHex, ToHex};
     use tcx_constants::CurveType;
 
     #[test]
     fn test_import_and_export() {
         let raw_private_key = "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a22437544586b6b4b46773549656d55685a545173514369534e6d6a327062545052495439514f736c587846733d227d";
-        let key_info = KeyInfo::from_lotus(&hex::decode(raw_private_key).unwrap()).unwrap();
+        let key_info = KeyInfo::from_lotus(&Vec::from_hex(raw_private_key).unwrap()).unwrap();
         assert_eq!(key_info.r#type, "secp256k1");
         assert_eq!(
-            hex::encode(key_info.decode_private_key().unwrap()),
+            key_info.decode_private_key().unwrap().to_hex(),
             "0ae0d7924285c3921e9948594d0b100a248d9a3da96d33d1213f503ac957c45b"
         );
 
-        assert_eq!(hex::encode(key_info.to_json().unwrap()), raw_private_key);
+        assert_eq!(key_info.to_json().unwrap().to_hex(), raw_private_key);
     }
 
     #[test]
-    fn test_from_private_key() {
+    fn test_from_private_key_secp256k1() {
         let key_info = KeyInfo::from_private_key(
             CurveType::SECP256k1,
-            &hex::decode("0ae0d7924285c3921e9948594d0b100a248d9a3da96d33d1213f503ac957c45b")
+            &Vec::from_hex("0ae0d7924285c3921e9948594d0b100a248d9a3da96d33d1213f503ac957c45b")
                 .unwrap(),
         )
         .unwrap();
 
-        assert_eq!(hex::encode(key_info.to_json().unwrap()), "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a22437544586b6b4b46773549656d55685a545173514369534e6d6a327062545052495439514f736c587846733d227d");
+        assert_eq!(key_info.to_json().unwrap().to_hex(), "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a22437544586b6b4b46773549656d55685a545173514369534e6d6a327062545052495439514f736c587846733d227d");
+    }
+
+    #[test]
+    fn test_from_private_key_bls() {
+        let key_info = KeyInfo::from_private_key(
+            CurveType::BLS,
+            &Vec::from_hex("0ae0d7924285c3921e9948594d0b100a248d9a3da96d33d1213f503ac957c45b")
+                .unwrap(),
+        )
+        .unwrap();
+
+        assert_eq!(key_info.to_json().unwrap().to_hex(), "7b2254797065223a22626c73222c22507269766174654b6579223a22437544586b6b4b46773549656d55685a545173514369534e6d6a327062545052495439514f736c587846733d227d");
+    }
+
+    #[test]
+    fn test_from_private_key_invalid_curve_type() {
+        let actual = KeyInfo::from_private_key(
+            CurveType::ED25519Blake2bNano,
+            &Vec::from_hex("0ae0d7924285c3921e9948594d0b100a248d9a3da96d33d1213f503ac957c45b")
+                .unwrap(),
+        );
+
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::InvalidCurveType.to_string()
+        );
     }
 }
diff --git a/token-core/tcx-filecoin/src/lib.rs b/token-core/tcx-filecoin/src/lib.rs
index eea64ce8..9df4b6a3 100644
--- a/token-core/tcx-filecoin/src/lib.rs
+++ b/token-core/tcx-filecoin/src/lib.rs
@@ -1,5 +1,3 @@
-use failure::Fail;
-
 mod address;
 mod key_info;
 mod signer;
@@ -9,26 +7,40 @@ mod utils;
 pub use crate::address::FilecoinAddress;
 pub use crate::key_info::KeyInfo;
 pub use crate::transaction::{SignedMessage, UnsignedMessage};
-#[macro_use]
-extern crate failure;
 
-#[derive(Fail, Debug, PartialEq)]
+use thiserror::Error;
+
+#[derive(Error, Debug, PartialEq)]
 pub enum Error {
-    #[fail(display = "invalid_curve_type")]
+    #[error("invalid_curve_type")]
     InvalidCurveType,
 
-    #[fail(display = "cannot_found_account")]
+    #[error("cannot_found_account")]
     CannotFoundAccount,
 
-    #[fail(display = "invalid_address")]
+    #[error("invalid_address")]
     InvalidAddress,
 
-    #[fail(display = "invalid_format")]
+    #[error("invalid_format")]
     InvalidFormat,
 
-    #[fail(display = "invalid_param")]
+    #[error("invalid_param")]
     InvalidParam,
 
-    #[fail(display = "invalid_number")]
+    #[error("invalid_number")]
     InvalidNumber,
+
+    #[error("invalid_method_id")]
+    InvalidMethodId,
+}
+
+pub mod filecoin {
+
+    pub static CHAINS: [&str; 1] = ["FILECOIN"];
+
+    pub type Address = crate::FilecoinAddress;
+
+    pub type TransactionInput = crate::UnsignedMessage;
+
+    pub type TransactionOutput = crate::SignedMessage;
 }
diff --git a/token-core/tcx-filecoin/src/signer.rs b/token-core/tcx-filecoin/src/signer.rs
index 4fa2bb32..413c7526 100644
--- a/token-core/tcx-filecoin/src/signer.rs
+++ b/token-core/tcx-filecoin/src/signer.rs
@@ -1,16 +1,16 @@
 use crate::transaction::{Signature, SignedMessage, UnsignedMessage};
 use crate::utils::{digest, HashSize};
 use crate::Error;
+use anyhow::anyhow;
 use forest_address::Address;
 use forest_cid::Cid;
 use forest_encoding::Cbor;
 use forest_message::UnsignedMessage as ForestUnsignedMessage;
-use forest_vm::Serialized;
-use num_bigint_chainsafe::BigInt;
+use forest_vm::{Serialized, TokenAmount};
 use std::convert::TryFrom;
 use std::str::FromStr;
-use tcx_chain::{ChainSigner, Keystore, Result, TransactionSigner};
 use tcx_constants::CurveType;
+use tcx_keystore::{tcx_ensure, Keystore, Result, SignatureParameters, Signer, TransactionSigner};
 
 impl TryFrom<&UnsignedMessage> for ForestUnsignedMessage {
     type Error = crate::Error;
@@ -20,16 +20,17 @@ impl TryFrom<&UnsignedMessage> for ForestUnsignedMessage {
     ) -> core::result::Result<ForestUnsignedMessage, Self::Error> {
         let to = Address::from_str(&message.to).map_err(|_| Error::InvalidAddress)?;
         let from = Address::from_str(&message.from).map_err(|_| Error::InvalidAddress)?;
-        let value = BigInt::from_str(&message.value).map_err(|_| Error::InvalidNumber)?;
+        let value = TokenAmount::from_str(&message.value).map_err(|_| Error::InvalidNumber)?;
         let gas_limit = message.gas_limit;
         let gas_fee_cap =
-            BigInt::from_str(&message.gas_fee_cap).map_err(|_| Error::InvalidNumber)?;
+            TokenAmount::from_str(&message.gas_fee_cap).map_err(|_| Error::InvalidNumber)?;
         let gas_premium =
-            BigInt::from_str(&message.gas_premium).map_err(|_| Error::InvalidNumber)?;
+            TokenAmount::from_str(&message.gas_premium).map_err(|_| Error::InvalidNumber)?;
 
         let message_params_bytes =
             base64::decode(&message.params).map_err(|_| Error::InvalidParam)?;
         let params = Serialized::new(message_params_bytes);
+        tcx_ensure!(message.method == 0, Error::InvalidMethodId);
 
         let tmp = ForestUnsignedMessage::builder()
             .to(to)
@@ -51,29 +52,21 @@ impl TryFrom<&UnsignedMessage> for ForestUnsignedMessage {
 impl TransactionSigner<UnsignedMessage, SignedMessage> for Keystore {
     fn sign_transaction(
         &mut self,
-        symbol: &str,
-        address: &str,
+        sign_context: &SignatureParameters,
         tx: &UnsignedMessage,
     ) -> Result<SignedMessage> {
         let unsigned_message = forest_message::UnsignedMessage::try_from(tx)?;
 
-        let account = self.account(symbol, address);
         let signature_type;
 
-        if account.is_none() {
-            return Err(Error::CannotFoundAccount.into());
-        }
-
         let signature;
         let mut cid: Cid = unsigned_message.cid()?;
-        match account.unwrap().curve {
+        match sign_context.curve {
             CurveType::SECP256k1 => {
                 signature_type = 1;
-                signature = self.sign_recoverable_hash(
+                signature = self.secp256k1_ecdsa_sign_recoverable(
                     &digest(&cid.to_bytes(), HashSize::Default),
-                    symbol,
-                    address,
-                    None,
+                    &sign_context.derivation_path,
                 )?;
 
                 let forest_sig = forest_crypto::Signature::new_secp256k1(signature.clone());
@@ -83,11 +76,16 @@ impl TransactionSigner<UnsignedMessage, SignedMessage> for Keystore {
                 };
                 cid = forest_signed_msg
                     .cid()
-                    .map_err(|_e| format_err!("{}", "forest_message cid error"))?;
+                    .map_err(|_e| anyhow!("{}", "forest_message cid error"))?;
             }
             CurveType::BLS => {
                 signature_type = 2;
-                signature = self.sign_hash(&cid.to_bytes(), symbol, address, None)?;
+                signature = self.bls_sign(
+                    &cid.to_bytes(),
+                    &sign_context.derivation_path,
+                    "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_",
+                )?;
+                // use unsigned_message https://github.com/filecoin-project/lotus/issues/101
                 cid = unsigned_message.cid()?;
             }
             _ => return Err(Error::InvalidCurveType.into()),
@@ -106,9 +104,10 @@ impl TransactionSigner<UnsignedMessage, SignedMessage> for Keystore {
 
 #[cfg(test)]
 mod tests {
-    use crate::{FilecoinAddress, KeyInfo, UnsignedMessage};
-    use tcx_chain::{Keystore, Metadata, TransactionSigner};
-    use tcx_constants::{CoinInfo, CurveType};
+    use crate::{Error, KeyInfo, UnsignedMessage};
+    use tcx_common::{FromHex, ToHex};
+    use tcx_constants::CurveType;
+    use tcx_keystore::{Keystore, Metadata, SignatureParameters, TransactionSigner};
 
     #[test]
     fn test_sign_spec256k1() {
@@ -126,27 +125,26 @@ mod tests {
 
         let key_info =
             KeyInfo::from_lotus(
-                &hex::decode("7b2254797065223a22736563703235366b31222c22507269766174654b6579223a222f5059574777574e577a58614d5675437a613958502b314b4a695a4474696f4c76777863754268783041553d227d").unwrap()).unwrap();
+                &Vec::from_hex("7b2254797065223a22736563703235366b31222c22507269766174654b6579223a222f5059574777574e577a58614d5675437a613958502b314b4a695a4474696f4c76777863754268783041553d227d").unwrap()).unwrap();
         let private_key = key_info.decode_private_key().unwrap();
-        let mut ks =
-            Keystore::from_private_key(&hex::encode(private_key), "Password", Metadata::default());
+        let mut ks = Keystore::from_private_key(
+            &private_key.to_hex(),
+            "Password",
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
         ks.unlock_by_password("Password").unwrap();
 
-        let coin_info = CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "".to_string(),
+        let sign_context = SignatureParameters {
             curve: CurveType::SECP256k1,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
+            derivation_path: "".to_string(),
+            chain_type: "FILECOIN".to_string(),
+            ..Default::default()
         };
-
-        let account = ks
-            .derive_coin::<FilecoinAddress>(&coin_info)
-            .unwrap()
-            .clone();
-
         let signed_message = ks
-            .sign_transaction("FILECOIN", &account.address, &unsigned_message)
+            .sign_transaction(&sign_context, &unsigned_message)
             .unwrap();
         let signature = signed_message.signature.unwrap();
 
@@ -158,6 +156,47 @@ mod tests {
         assert_eq!(signature.data, "MCTI+WjYRozaU/7gYWAwSeOixkSmIHDWHwsU1NVPTrtH4IkXPUrgRcZh4DduJqvHLzoek31LYZxhWkGAzd0j9wA=");
     }
 
+    #[test]
+    fn test_invalid_method_id() {
+        let unsigned_message = UnsignedMessage {
+            to: "f1zlkjwo5pnm6petm4u4luj6gb6e64eecrw4t4stq".to_string(),
+            from: "f12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey".to_string(),
+            nonce: 1,
+            value: "10000000000000000".to_string(),
+            gas_limit: 491585,
+            gas_fee_cap: "151367".to_string(),
+            gas_premium: "150313".to_string(),
+            method: 1,
+            params: "".to_string(),
+        };
+
+        let key_info =
+            KeyInfo::from_lotus(
+                &Vec::from_hex("7b2254797065223a22736563703235366b31222c22507269766174654b6579223a222f5059574777574e577a58614d5675437a613958502b314b4a695a4474696f4c76777863754268783041553d227d").unwrap()).unwrap();
+        let private_key = key_info.decode_private_key().unwrap();
+        let mut ks = Keystore::from_private_key(
+            &private_key.to_hex(),
+            "Password",
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        ks.unlock_by_password("Password").unwrap();
+
+        let sign_context = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "".to_string(),
+            chain_type: "FILECOIN".to_string(),
+            ..Default::default()
+        };
+        let signed_message = ks.sign_transaction(&sign_context, &unsigned_message);
+        assert_eq!(
+            format!("{}", signed_message.err().unwrap()),
+            "invalid_method_id"
+        );
+    }
+
     #[test]
     fn test_sign_bls() {
         let unsigned_message = UnsignedMessage {
@@ -174,27 +213,26 @@ mod tests {
 
         let key_info =
             KeyInfo::from_lotus(
-                &hex::decode("7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d").unwrap()).unwrap();
+                &Vec::from_hex("7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d").unwrap()).unwrap();
         let private_key = key_info.decode_private_key().unwrap();
-        let mut ks =
-            Keystore::from_private_key(&hex::encode(private_key), "Password", Metadata::default());
+        let mut ks = Keystore::from_private_key(
+            &private_key.to_hex(),
+            "Password",
+            CurveType::BLS,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
         ks.unlock_by_password("Password").unwrap();
 
-        let coin_info = CoinInfo {
-            coin: "FILECOIN".to_string(),
-            derivation_path: "".to_string(),
+        let sign_context = SignatureParameters {
             curve: CurveType::BLS,
-            network: "MAINNET".to_string(),
-            seg_wit: "".to_string(),
+            derivation_path: "".to_string(),
+            chain_type: "FILECOIN".to_string(),
+            ..Default::default()
         };
-
-        let account = ks
-            .derive_coin::<FilecoinAddress>(&coin_info)
-            .unwrap()
-            .clone();
-
         let signed_message = ks
-            .sign_transaction("FILECOIN", &account.address, &unsigned_message)
+            .sign_transaction(&sign_context, &unsigned_message)
             .unwrap();
         let signature = signed_message.signature.unwrap();
 
@@ -205,4 +243,45 @@ mod tests {
         );
         assert_eq!(signature.data, "tNRsgNdWO6UdY9IOh5tvzcL1Dwi7gljLt22aITKUgtF363lrP2gHxOX9oNGhnFD6BoM4/Y/HMzETlYF0r4+1aHZo1F8fV3XDwxwwz1HKxoDIreXBtPAjTiqBGlTiMwPX");
     }
+
+    #[test]
+    fn test_sign_invalid_curve_type() {
+        let unsigned_message = UnsignedMessage {
+            to: "f1zlkjwo5pnm6petm4u4luj6gb6e64eecrw4t4stq".to_string(),
+            from: "f3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa".to_string(),
+            nonce: 1,
+            value: "10000000000000000".to_string(),
+            gas_limit: 491585,
+            gas_fee_cap: "151367".to_string(),
+            gas_premium: "150313".to_string(),
+            method: 0,
+            params: "".to_string()
+        };
+
+        let key_info =
+            KeyInfo::from_lotus(
+                &Vec::from_hex("7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d").unwrap()).unwrap();
+        let private_key = key_info.decode_private_key().unwrap();
+        let mut ks = Keystore::from_private_key(
+            &private_key.to_hex(),
+            "Password",
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        ks.unlock_by_password("Password").unwrap();
+
+        let sign_context = SignatureParameters {
+            curve: CurveType::SR25519,
+            derivation_path: "".to_string(),
+            chain_type: "FILECOIN".to_string(),
+            ..Default::default()
+        };
+        let actual = ks.sign_transaction(&sign_context, &unsigned_message);
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            Error::InvalidCurveType.to_string()
+        );
+    }
 }
diff --git a/token-core/tcx-keystore/Cargo.toml b/token-core/tcx-keystore/Cargo.toml
new file mode 100644
index 00000000..951801f5
--- /dev/null
+++ b/token-core/tcx-keystore/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "tcx-keystore"
+version = "0.1.0"
+authors = ["Neal Xu <imxuneal@gmail.com>"]
+edition = "2021"
+
+[dependencies]
+tcx-crypto = { path = "../tcx-crypto" }
+tcx-primitive = { path = "../tcx-primitive" }
+tcx-constants = { path = "../tcx-constants" }
+tcx-common = {path = "../tcx-common"}
+
+bitcoin = "=0.29.2"
+byteorder = "=1.4.3"
+secp256k1 = { version = "=0.24.3", features = ["rand", "recovery"] }
+tiny-bip39 = "=1.0.0"
+bitcoin_hashes = "=0.11.0"
+uuid = { version = "=1.2.2", features = ["serde", "v4"] }
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+anyhow = { version = "=1.0.79", features = [] }
+regex = "=1.9.3"
+hex = "=0.4.3"
+
+sha2 = "=0.10.6"
+hmac-sha256 = "=1.1.6"
+multihash = "=0.18.1"
+lazy_static = "=1.4.0"
+parking_lot = "=0.12.1"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+thiserror = "=1.0.56"
+
+[dev-dependencies.cargo-husky]
+version = "1"
+default-features = false
+features = ["precommit-hook", "run-cargo-fmt"]
+
+
+[features]
+default = []
+cache_dk = []
diff --git a/token-core/tcx-chain/README.md b/token-core/tcx-keystore/README.md
similarity index 100%
rename from token-core/tcx-chain/README.md
rename to token-core/tcx-keystore/README.md
diff --git a/token-core/tcx-keystore/src/identity.rs b/token-core/tcx-keystore/src/identity.rs
new file mode 100644
index 00000000..f87e3f29
--- /dev/null
+++ b/token-core/tcx-keystore/src/identity.rs
@@ -0,0 +1,433 @@
+use crate::keystore::IdentityNetwork;
+use crate::Error;
+use crate::Result;
+use bip39::Seed;
+use bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_MAIN;
+use bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_TEST;
+use bitcoin::consensus::{Decodable, Encodable};
+use bitcoin::network::constants::Network;
+use bitcoin::util::base58;
+use bitcoin::util::bip32::ExtendedPrivKey;
+use bitcoin::util::key::PrivateKey;
+use bitcoin::VarInt;
+use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
+use hmac_sha256::HMAC;
+use multihash::{Code, MultihashDigest};
+use secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
+use secp256k1::{Message, PublicKey, Secp256k1};
+use serde::{Deserialize, Serialize};
+use std::io::{Cursor, Read, Write};
+use tcx_common::{keccak256, merkle_hash, random_u8_16, unix_timestamp, FromHex, ToHex};
+use tcx_crypto::aes::cbc::{decrypt_pkcs7, encrypt_pkcs7};
+use tcx_crypto::{crypto::Unlocker, EncPair};
+use tcx_primitive::{PrivateKey as TraitPrivateKey, Secp256k1PrivateKey};
+
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct Identity {
+    pub enc_auth_key: EncPair,
+    pub enc_key: String,
+    pub identifier: String,
+    pub ipfs_id: String,
+}
+
+impl Identity {
+    pub fn new(
+        master_private_key: &[u8],
+        unlocker: &Unlocker,
+        network: &IdentityNetwork,
+    ) -> Result<Self> {
+        let (network_type, network_salt) = if network == &IdentityNetwork::Mainnet {
+            (Network::Bitcoin, "Mainnet")
+        } else {
+            (Network::Testnet, "Testnet")
+        };
+
+        let salt = format!("Automatic Backup Key {}", network_salt);
+
+        let backup_key = HMAC::mac(salt.as_bytes(), master_private_key);
+
+        let authentication_key = HMAC::mac("Authentication Key".as_bytes(), backup_key);
+
+        let auth_private_key = PrivateKey::from_slice(authentication_key.as_ref(), network_type)?;
+        let secp = Secp256k1::new();
+        let auth_pubkey_hash = auth_private_key.public_key(&secp).pubkey_hash();
+
+        let network_header = if network == &IdentityNetwork::Mainnet {
+            PUBKEY_ADDRESS_PREFIX_MAIN
+        } else {
+            PUBKEY_ADDRESS_PREFIX_TEST
+        };
+
+        let version = 2;
+        let magic_hex = "0fdc0c"; // a magic header to generate a im prefix after base58
+        let full_identifier = format!(
+            "{}{:02x}{:02x}{:02x}",
+            magic_hex, network_header, version, auth_pubkey_hash
+        );
+        let identifier = base58::check_encode_slice(Vec::from_hex(full_identifier)?.as_slice());
+
+        //gen enckey
+        let enc_key_bytes = HMAC::mac("Encryption Key".as_bytes(), backup_key);
+
+        let enc_private_key = PrivateKey::new_uncompressed(
+            secp256k1::SecretKey::from_slice(enc_key_bytes.as_ref())?,
+            network_type,
+        );
+        let multihash =
+            Code::Sha2_256.digest(enc_private_key.public_key(&secp).to_bytes().as_slice());
+        let ipfs_id = base58::encode_slice(&multihash.to_bytes());
+        let enc_auth_key = unlocker.encrypt_with_random_iv(authentication_key.as_slice())?;
+
+        Ok(Identity {
+            enc_auth_key,
+            enc_key: enc_key_bytes.to_hex(),
+            identifier,
+            ipfs_id,
+        })
+    }
+
+    pub fn from_seed(seed: &Seed, unlocker: &Unlocker, network: &IdentityNetwork) -> Result<Self> {
+        let network_type = if network == &IdentityNetwork::Mainnet {
+            Network::Bitcoin
+        } else {
+            Network::Testnet
+        };
+
+        let master_key = ExtendedPrivKey::new_master(network_type, seed.as_ref())?;
+        Self::new(&master_key.private_key.secret_bytes(), unlocker, network)
+    }
+
+    pub fn from_private_key(
+        private_key: &str,
+        unlocker: &Unlocker,
+        network: &IdentityNetwork,
+    ) -> Result<Self> {
+        let private_key_bytes = Vec::<u8>::from_hex_auto(private_key)?;
+        Self::new(&private_key_bytes, unlocker, network)
+    }
+
+    pub fn calculate_ipfs_id(pub_key: &PublicKey) -> String {
+        let multihash = Code::Sha2_256.digest(&pub_key.serialize_uncompressed());
+        base58::encode_slice(&multihash.to_bytes())
+    }
+
+    pub fn encrypt_ipfs(&self, plaintext: &str) -> Result<String> {
+        encrypt_ipfs_with_enc_key(&self.enc_key, plaintext)
+    }
+
+    pub fn decrypt_ipfs(&self, ciphertext: &str) -> Result<String> {
+        decrypt_ipfs_with_enc_key(ciphertext, &self.ipfs_id, &self.enc_key)
+    }
+
+    pub fn sign_authentication_message(
+        &self,
+        access_time: u64,
+        device_token: &str,
+        unlocker: &Unlocker,
+    ) -> Result<String> {
+        let enc_auth_key = unlocker.decrypt_enc_pair(&self.enc_auth_key)?;
+        let mut signature = Secp256k1PrivateKey::from_slice(&enc_auth_key)?.sign_recoverable(
+            &keccak256(format!("{}.{}.{}", access_time, self.identifier, device_token).as_bytes()),
+        )?;
+        signature[64] += 27;
+        Ok(signature.to_0x_hex())
+    }
+}
+
+pub fn decrypt_ipfs_with_enc_key(ciphertext: &str, ipfs_id: &str, enc_key: &str) -> Result<String> {
+    let ciphertext = Vec::<u8>::from_hex(ciphertext)?;
+    if ciphertext.len() <= 21 {
+        return Err(Error::InvalidEncryptionData.into());
+    }
+
+    let mut rdr = Cursor::new(&ciphertext);
+    let mut header = vec![];
+
+    let version = rdr.read_u8()?;
+    if version != 0x03 {
+        return Err(Error::UnsupportEncryptionDataVersion.into());
+    }
+    header.write_u8(version)?;
+    header.write_u32::<LittleEndian>(rdr.read_u32::<LittleEndian>()?)?;
+
+    let mut iv = [0u8; 16];
+    rdr.read_exact(&mut iv)?;
+    header.write_all(&iv)?;
+
+    let var_len = VarInt::consensus_decode(&mut rdr)?;
+    if var_len.0 as usize != ciphertext.len() - 21 - 65 - var_len.len() {
+        return Err(Error::InvalidEncryptionData.into());
+    }
+
+    let mut enc_data = vec![0u8; var_len.0 as usize];
+    rdr.read_exact(&mut enc_data)?;
+
+    let mut signature = [0u8; 64];
+    rdr.read_exact(&mut signature)?;
+
+    let recover_id = RecoveryId::from_i32(rdr.read_u8()? as i32 - 27)?;
+
+    let hash = keccak256(
+        [header, merkle_hash(&enc_data).to_vec()]
+            .concat()
+            .as_slice(),
+    );
+
+    let message = Message::from_slice(&hash)?;
+    let sig = RecoverableSignature::from_compact(&signature, recover_id)?;
+    let pub_key = Secp256k1::new().recover_ecdsa(&message, &sig)?;
+    let calculated_ipfs_id = Identity::calculate_ipfs_id(&pub_key);
+
+    if ipfs_id != calculated_ipfs_id {
+        return Err(Error::InvalidEncryptionDataSignature.into());
+    }
+
+    let enc_key = Vec::from_hex(&enc_key)?;
+    let plaintext = decrypt_pkcs7(&enc_data, &enc_key[..16], &iv)?;
+
+    Ok(String::from_utf8(plaintext)?)
+}
+
+pub fn encrypt_ipfs_with_enc_key(enc_key: &str, plaintext: &str) -> Result<String> {
+    let iv: [u8; 16] = random_u8_16();
+    encrypt_ipfs_wth_timestamp_iv(&enc_key, plaintext, unix_timestamp(), &iv)
+}
+
+fn encrypt_ipfs_wth_timestamp_iv(
+    enc_key: &str,
+    plaintext: &str,
+    timestamp: u64,
+    iv: &[u8; 16],
+) -> Result<String> {
+    let mut header = Vec::new();
+
+    header.write_u8(0x03)?;
+    header.write_all(&timestamp.to_le_bytes()[..4])?;
+    header.write_all(iv)?;
+
+    let enc_key = Vec::from_hex_auto(&enc_key)?;
+
+    let ciphertext = encrypt_pkcs7(plaintext.as_bytes(), &enc_key[0..16], iv)?;
+    let hash = keccak256(&[header.clone(), merkle_hash(&ciphertext).to_vec()].concat());
+    let mut signature = Secp256k1PrivateKey::from_slice(&enc_key)?.sign_recoverable(&hash)?;
+    //ETH-compatible ec_recover, in chain_id = 1 case, v = 27 + rec_id
+    signature[64] += 27;
+
+    let var_len = VarInt(ciphertext.len() as u64);
+
+    let mut payload = vec![];
+    payload.write_all(&header)?;
+    var_len.consensus_encode(&mut payload)?;
+    payload.write_all(&ciphertext)?;
+    payload.write_all(&signature)?;
+
+    Ok(payload.to_hex())
+}
+
+#[cfg(test)]
+mod test {
+
+    use tcx_common::FromHex;
+    use tcx_constants::sample_key::{MNEMONIC, PASSWORD, PRIVATE_KEY};
+    use tcx_constants::CurveType;
+    use tcx_crypto::Key;
+
+    use crate::identity::encrypt_ipfs_wth_timestamp_iv;
+    use crate::{keystore::IdentityNetwork, Error, HdKeystore, Metadata, PrivateKeystore};
+
+    #[test]
+    fn test_encrypt_ipfs() {
+        let mut meta = Metadata::default();
+        meta.network = IdentityNetwork::Testnet;
+        let mut keystore = HdKeystore::from_mnemonic(&MNEMONIC, &PASSWORD, meta).unwrap();
+        keystore
+            .unlock(&Key::Password(PASSWORD.to_owned()))
+            .unwrap();
+        let identity = keystore.identity();
+
+        let tests = [
+            "imToken",
+            "hello world",
+            "1234567890",
+            "a",
+            "A",
+            "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        ];
+
+        for t in tests {
+            let encrypted = identity.encrypt_ipfs(t).unwrap();
+            let plaintext = identity.decrypt_ipfs(&encrypted).unwrap();
+
+            assert_eq!(plaintext, t);
+        }
+    }
+
+    #[test]
+    fn test_decrypt_ipfs_failure() {
+        let mut meta = Metadata::default();
+        meta.network = IdentityNetwork::Testnet;
+        let mut keystore = HdKeystore::from_mnemonic(&MNEMONIC, &PASSWORD, meta).unwrap();
+        keystore
+            .unlock(&Key::Password(PASSWORD.to_owned()))
+            .unwrap();
+        let identity = keystore.identity();
+
+        let tests = [
+            ("imToken",
+             "11111111111111111111111111111111",
+             "0540b2495a1111111111111111111111111111111110b6602c68084bdd08dae796657aa6854ad13312fedc88f5b6f16c56b3e755dde125a1c4775db536ac0442ac942f9634c777f3ae5ca39f6abcae4bd6c87e54ab29ae0062b04d917b32e8d7c88eeb6261301b",
+             Error::UnsupportEncryptionDataVersion),
+            ("imToken",
+             "11111111111111111111111111111111",
+             "0340b2495a1111111111111111111111",
+             Error::InvalidEncryptionData),
+            ("imToken",
+             "11111111111111111111111111111111",
+             "0340b2495a1111111111111111111111111111111110b6602c68084bdd08dae796657aa6854ad13312fedc88f5b6f16c56b3e755dde125a1c4775db536ac0442ac942f9634c777f3ae5ca39f6abcae4bd6c87e54ab29ae0062b04d917b32e8d7c88eeb626130",
+             Error::InvalidEncryptionData),
+            ("imToken",
+             "11111111111111111111111111111111",
+             "0340b2495a1111111111111111111111111111111110b6602c68084bdd08dae888888886854ad13312fedc88f5b6f16c56b3e755dde125a1c4775db536ac0442ac942f9634c777f3ae5ca39f6abcae4bd6c87e54ab29ae0062b04d917b32e8d7c88eeb6261301b",
+             Error::InvalidEncryptionDataSignature)
+            ];
+
+        for t in tests {
+            assert_eq!(
+                identity.decrypt_ipfs(t.2).err().unwrap().to_string(),
+                t.3.to_string(),
+            );
+        }
+    }
+
+    #[test]
+    fn test_ipfs_with_timestamp_iv() {
+        let mut meta = Metadata::default();
+        meta.network = IdentityNetwork::Testnet;
+        let mut keystore = HdKeystore::from_mnemonic(&MNEMONIC, &PASSWORD, meta).unwrap();
+        keystore
+            .unlock(&Key::Password(PASSWORD.to_owned()))
+            .unwrap();
+        let identity = keystore.identity();
+
+        let test_cases = [
+            ("imToken", "11111111111111111111111111111111", "0340b2495a1111111111111111111111111111111110b6602c68084bdd08dae796657aa6854ad13312fedc88f5b6f16c56b3e755dde125a1c4775db536ac0442ac942f9634c777f3ae5ca39f6abcae4bd6c87e54ab29ae0062b04d917b32e8d7c88eeb6261301b"),
+            ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "11111111111111111111111111111111", "0340b2495a11111111111111111111111111111111708b7e9486a339f6c482ec9d3786dd9f99222fa64753bc2e7d246b0fed9c2153b8a5dcc59ea3e320aa153ceefdd909e8484d215121a9b8416d395de38313ef65b9e27d2ba0cc17bf29c5b26fa5aa5be1a2500b017f06cdd001e8cd908c5a48f10962880a61b4704754fd6bbe3b5a1a8332376651c28205a02574ed95a70363e0d1031d133c8d2376808b74ffd78b831ec659b44e9f3d3734d26abd44dda88fac86d1a5f0128f77d0558fb1ef6d2cc8f9541c"),
+            ("a", "11111111111111111111111111111111", "0340b2495a111111111111111111111111111111111084e741e2b83ec644e844985088fd58d8449cb690cd7389d74e3be1ccdca755b0235c90431b7635a441944d880bd52c860b109b7a05a960192719eb3f294ec1b72f5dfd1b8f4c6e992b9c3add7c7c1b871b"),
+            ("A", "11111111111111111111111111111111", "0340b2495a1111111111111111111111111111111110de32f176b67269ddfe24b2162eae14968d2eafcb53ec5741a07a1d65dc10189e0f6b4c199e98b02fcb9ec744b134cecc4ae8bfbf79e7703781c259eab9ee2fa31f887b24d04b37b7c5aa49a3ff2a8d5e1b"),
+            ("a", "11111111111111111111111111111111", "0340b2495a111111111111111111111111111111111084e741e2b83ec644e844985088fd58d8449cb690cd7389d74e3be1ccdca755b0235c90431b7635a441944d880bd52c860b109b7a05a960192719eb3f294ec1b72f5dfd1b8f4c6e992b9c3add7c7c1b871b"),
+            ("a", "22222222222222222222222222222222", "0340b2495a22222222222222222222222222222222102906146aa78fadd4abac01d9aa34dbd66463220fa0a98b9212594e7624a34bb20ba50df75cb04362f8dcfe7a8c44b2b5740a2d66de015d867e609463482686959ebba6047600562fa82e94ee905f1d291c"),
+        ];
+
+        let unix_timestamp = 1514779200u64;
+        for t in test_cases {
+            let iv: [u8; 16] = Vec::from_hex(t.1).unwrap().try_into().unwrap();
+            assert_eq!(
+                encrypt_ipfs_wth_timestamp_iv(&identity.enc_key, t.0, unix_timestamp, &iv).unwrap(),
+                t.2
+            );
+            assert_eq!(identity.decrypt_ipfs(t.2).unwrap(), t.0);
+        }
+    }
+
+    #[test]
+    fn test_invalid_mnemonic() {
+        let tests = [
+            "abandon abandon abandon abandon abandon",
+            "abandon abandon abandon aba",
+            "abandon abandon abandon aba",
+            "rocket wash opera menu stomach genre write husband observe cigar stand famous cancel duty",
+        ];
+
+        for t in tests {
+            let mut meta = Metadata::default();
+            meta.network = IdentityNetwork::Testnet;
+
+            let hd = HdKeystore::from_mnemonic(t, &PASSWORD, meta);
+            assert!(hd.is_err());
+        }
+    }
+
+    #[test]
+    fn test_authentication() {
+        let test_cases =  [
+            (IdentityNetwork::Mainnet, "0x120cc977f9023c90635144bd0f4c8b85ff8aa23c003edcced9449f0465d05e954bccf9c114484e472c1837b0394f1933ad78ec8050673099e8bf5e9329737fe01c"),
+            (IdentityNetwork::Testnet, "0x663ace6d60225f6d1a71d25735c66646f71977a9f25f709fca162db3c664a1e161881a51a8034c240dd8f0093285fd6245f65246708546e8eadd592f995daeb11c"),
+        ];
+
+        for item in test_cases {
+            let mut meta = Metadata::default();
+            meta.network = item.0;
+            let keystore = HdKeystore::from_mnemonic(&MNEMONIC, &PASSWORD, meta).unwrap();
+            let key = Key::Password(PASSWORD.to_string());
+            let unlocker = keystore.store().crypto.use_key(&key).unwrap();
+            let identity = keystore.identity();
+
+            let actual = identity.sign_authentication_message(1514736000, "12345ABCDE", &unlocker);
+            assert_eq!(actual.unwrap(), item.1);
+        }
+    }
+
+    #[test]
+    fn test_create_identity_from_mnemonic() {
+        let meta = Metadata::default();
+        let keystore = HdKeystore::from_mnemonic(&MNEMONIC, &PASSWORD, meta).unwrap();
+        let identity = keystore.identity();
+
+        assert_eq!(
+            "im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf",
+            identity.identifier
+        );
+        assert_eq!(
+            "QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6",
+            identity.ipfs_id
+        );
+    }
+
+    #[test]
+    fn test_create_identity_from_private_key() {
+        let meta = Metadata::default();
+        let keystore = PrivateKeystore::from_private_key(
+            &PRIVATE_KEY,
+            &PASSWORD,
+            tcx_constants::CurveType::SECP256k1,
+            meta,
+            None,
+        )
+        .unwrap();
+        let identity = &keystore.store().identity;
+
+        assert_eq!(
+            "im14x5GLbjpSGz4Y2ebqcP2aN2R1qY54qKsX6bj",
+            identity.identifier
+        );
+        assert_eq!(
+            "QmYS86Nzo9mi7ccBH7iZc11ModqXahbUxtTDNaZHU6EHqV",
+            identity.ipfs_id
+        );
+    }
+
+    #[test]
+    fn test_create_identity_from_private_key_testnet() {
+        let mut meta = Metadata::default();
+        meta.network = IdentityNetwork::Testnet;
+        let keystore = PrivateKeystore::from_private_key(
+            &PRIVATE_KEY,
+            &PASSWORD,
+            CurveType::SECP256k1,
+            meta,
+            None,
+        )
+        .unwrap();
+        let identity = &keystore.store().identity;
+
+        assert_eq!(
+            "im18MD7LnJJa6vkDd9jZmjqXw2N7K9KZuk2bGjW",
+            identity.identifier
+        );
+        assert_eq!(
+            "QmYtS45NgsQBqZdJbJGn33DYPWGsSbmUbuuVoR2rdfaJWV",
+            identity.ipfs_id
+        );
+    }
+}
diff --git a/token-core/tcx-keystore/src/keystore/guard.rs b/token-core/tcx-keystore/src/keystore/guard.rs
new file mode 100644
index 00000000..00a9114f
--- /dev/null
+++ b/token-core/tcx-keystore/src/keystore/guard.rs
@@ -0,0 +1,97 @@
+use super::Keystore;
+use super::Result;
+use tcx_crypto::Key;
+
+pub struct KeystoreGuard<'a> {
+    keystore: &'a mut Keystore,
+}
+
+impl<'a> Drop for KeystoreGuard<'a> {
+    fn drop(&mut self) {
+        self.keystore.lock();
+    }
+}
+
+impl<'a> KeystoreGuard<'a> {
+    pub fn unlock_by_password(ks: &'a mut Keystore, password: &str) -> Result<KeystoreGuard<'a>> {
+        ks.unlock_by_password(password)?;
+
+        Ok(KeystoreGuard { keystore: ks })
+    }
+
+    pub fn unlock_by_derived_key(
+        ks: &'a mut Keystore,
+        derived_key: &str,
+    ) -> Result<KeystoreGuard<'a>> {
+        ks.unlock_by_derived_key(derived_key)?;
+
+        Ok(KeystoreGuard { keystore: ks })
+    }
+
+    pub fn unlock(ks: &'a mut Keystore, key: Key) -> Result<KeystoreGuard<'a>> {
+        ks.unlock(&key)?;
+
+        Ok(KeystoreGuard { keystore: ks })
+    }
+
+    pub fn keystore_mut(&mut self) -> &mut Keystore {
+        self.keystore
+    }
+
+    pub fn keystore(&self) -> &Keystore {
+        self.keystore
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{Keystore, KeystoreGuard, Metadata};
+    use tcx_common::ToHex;
+    use tcx_constants::sample_key::{PRIVATE_KEY, WRONG_PASSWORD};
+    use tcx_constants::CurveType::{self, SECP256k1};
+    use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
+
+    #[test]
+    fn test_keystore_failure() {
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        let guard = KeystoreGuard::unlock_by_password(&mut ks, WRONG_PASSWORD);
+
+        assert!(guard.is_err());
+    }
+
+    #[test]
+    fn test_keystore_guard_drop() {
+        let mut ks =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        {
+            let mut guard = KeystoreGuard::unlock_by_password(&mut ks, TEST_PASSWORD).unwrap();
+            let private_key = guard
+                .keystore_mut()
+                .get_private_key(SECP256k1, "m/44'/60'/0'/0/0")
+                .unwrap();
+
+            assert_eq!(private_key.to_bytes().to_0x_hex(), PRIVATE_KEY);
+            assert!(!guard.keystore().is_locked());
+        }
+
+        assert!(ks.is_locked());
+
+        let mut ks = Keystore::from_private_key(
+            PRIVATE_KEY,
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        let derived_key = ks.get_derived_key(&TEST_PASSWORD).unwrap();
+
+        {
+            let guard = KeystoreGuard::unlock_by_derived_key(&mut ks, &derived_key).unwrap();
+            assert!(!guard.keystore().is_locked());
+        }
+
+        assert!(ks.is_locked());
+    }
+}
diff --git a/token-core/tcx-keystore/src/keystore/hd.rs b/token-core/tcx-keystore/src/keystore/hd.rs
new file mode 100644
index 00000000..c2e72031
--- /dev/null
+++ b/token-core/tcx-keystore/src/keystore/hd.rs
@@ -0,0 +1,793 @@
+use bip39::{Language, Mnemonic, Seed};
+
+use crate::identity::Identity;
+use uuid::Uuid;
+
+use super::{transform_mnemonic_error, Account, Address, Error, Metadata, Result, Store};
+
+use std::collections::{hash_map::Entry, HashMap};
+
+use tcx_common::{FromHex, ToHex};
+use tcx_constants::{coin_info::get_xpub_prefix, CoinInfo, CurveType};
+use tcx_crypto::{Crypto, Key};
+use tcx_primitive::{
+    generate_mnemonic, get_account_path, Bip32DeterministicPrivateKey, Derive,
+    DeterministicPrivateKey, TypedDeterministicPrivateKey, TypedDeterministicPublicKey,
+    TypedPrivateKey,
+};
+
+#[derive(Clone)]
+struct Cache {
+    mnemonic: String,
+    keys: HashMap<String, TypedDeterministicPrivateKey>,
+}
+
+impl Cache {
+    fn get_cache_key(derivation_path: &str, curve: CurveType) -> String {
+        format!("{}-{}", derivation_path, curve.as_str())
+    }
+
+    pub fn get_or_insert<F>(
+        &mut self,
+        key: &str,
+        curve: CurveType,
+        f: F,
+    ) -> Result<TypedDeterministicPrivateKey>
+    where
+        F: FnOnce() -> Result<TypedDeterministicPrivateKey>,
+    {
+        let cache_key = Cache::get_cache_key(key, curve);
+        if let Entry::Vacant(e) = self.keys.entry(cache_key.clone()) {
+            let k = f()?;
+            e.insert(k.clone());
+            Ok(k)
+        } else {
+            Ok(self.keys[&cache_key].clone())
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct HdKeystore {
+    store: Store,
+    cache: Option<Cache>,
+}
+
+pub fn fingerprint_from_seed(seed: &Seed) -> Result<String> {
+    let xprv = Bip32DeterministicPrivateKey::from_seed(seed.as_bytes())?;
+    let xpub = xprv.deterministic_public_key();
+    let fingerprint = xpub.fingerprint();
+    Ok(fingerprint.to_0x_hex())
+}
+
+pub fn fingerprint_from_mnemonic(mnemonic: &str) -> Result<String> {
+    let mnemonic = &mnemonic.split_whitespace().collect::<Vec<&str>>().join(" ");
+    let seed = mnemonic_to_seed(mnemonic)?;
+    fingerprint_from_seed(&seed)
+}
+
+pub fn mnemonic_to_seed(mnemonic: &str) -> Result<Seed> {
+    let m = Mnemonic::from_phrase(mnemonic, Language::English).map_err(transform_mnemonic_error)?;
+    Ok(Seed::new(&m, ""))
+}
+
+impl HdKeystore {
+    pub const VERSION: i64 = 12000i64;
+
+    pub fn store(&self) -> &Store {
+        &self.store
+    }
+
+    pub fn store_mut(&mut self) -> &mut Store {
+        &mut self.store
+    }
+
+    pub fn from_store(store: Store) -> Self {
+        HdKeystore { store, cache: None }
+    }
+
+    pub(crate) fn unlock(&mut self, key: &Key) -> Result<()> {
+        let mnemonic_bytes = self.store.crypto.use_key(key)?.plaintext()?;
+
+        self.cache_mnemonic(mnemonic_bytes)
+    }
+
+    fn cache_mnemonic(&mut self, mnemonic_bytes: Vec<u8>) -> Result<()> {
+        let mnemonic_str = String::from_utf8(mnemonic_bytes)?;
+        let _ = mnemonic_to_seed(&mnemonic_str)?;
+
+        let _mnemonic = Mnemonic::from_phrase(&mnemonic_str, Language::English);
+
+        self.cache = Some(Cache {
+            mnemonic: mnemonic_str,
+            keys: HashMap::new(),
+        });
+
+        Ok(())
+    }
+
+    pub(crate) fn lock(&mut self) {
+        self.cache = None;
+    }
+
+    pub(crate) fn is_locked(&self) -> bool {
+        self.cache.is_none()
+    }
+
+    pub(crate) fn mnemonic(&self) -> Result<String> {
+        let cache = self.cache.as_ref().ok_or(Error::KeystoreLocked)?;
+
+        Ok(cache.mnemonic.to_string())
+    }
+
+    pub(crate) fn get_deterministic_public_key(
+        &mut self,
+        curve: CurveType,
+        derivation_path: &str,
+    ) -> Result<TypedDeterministicPublicKey> {
+        let dpk = self.get_deterministic_private_key(curve, derivation_path)?;
+        Ok(dpk.deterministic_public_key())
+    }
+
+    pub(crate) fn get_deterministic_private_key(
+        &mut self,
+        curve: CurveType,
+        derivation_path: &str,
+    ) -> Result<TypedDeterministicPrivateKey> {
+        let cache = self.cache.as_mut().ok_or(Error::KeystoreLocked)?;
+        let mnemonic = cache.mnemonic.clone();
+
+        let root = cache.get_or_insert("", curve, || {
+            TypedDeterministicPrivateKey::from_mnemonic(curve, &mnemonic)
+        })?;
+
+        if derivation_path.len() > 0 {
+            root.derive(derivation_path)
+        } else {
+            Ok(root)
+        }
+    }
+
+    pub(crate) fn get_private_key(
+        &mut self,
+        curve: CurveType,
+        derivation_path: &str,
+    ) -> Result<TypedPrivateKey> {
+        let dpk = self.get_deterministic_private_key(curve, derivation_path)?;
+        Ok(dpk.private_key())
+    }
+
+    pub fn new(password: &str, meta: Metadata) -> HdKeystore {
+        let mnemonic = generate_mnemonic();
+
+        Self::from_mnemonic(&mnemonic, password, meta).unwrap()
+    }
+
+    pub fn from_mnemonic(mnemonic: &str, password: &str, meta: Metadata) -> Result<HdKeystore> {
+        let valid_mnemonic = &mnemonic.split_whitespace().collect::<Vec<&str>>().join(" ");
+        let seed = mnemonic_to_seed(valid_mnemonic)?;
+        let fingerprint = fingerprint_from_seed(&seed)?;
+
+        let crypto: Crypto = Crypto::new(password, valid_mnemonic.as_bytes());
+        let unlocker = crypto.use_key(&Key::Password(password.to_string()))?;
+        let identity = Identity::from_seed(&seed, &unlocker, &meta.network)?;
+        let enc_original = unlocker.encrypt_with_random_iv(mnemonic.as_bytes())?;
+
+        Ok(HdKeystore {
+            store: Store {
+                source_fingerprint: fingerprint,
+                crypto,
+                id: Uuid::new_v4().as_hyphenated().to_string(),
+                version: Self::VERSION,
+                meta,
+                identity,
+                curve: None,
+                enc_original,
+            },
+
+            cache: None,
+        })
+    }
+
+    pub fn derive_coin<A: Address>(&mut self, coin_info: &CoinInfo) -> Result<Account> {
+        self.cache.as_ref().ok_or(Error::KeystoreLocked)?;
+
+        let root = self.get_deterministic_private_key(coin_info.curve, "")?;
+
+        let private_key = root.derive(&coin_info.derivation_path)?.private_key();
+        let public_key = private_key.public_key();
+
+        let address = A::from_public_key(&public_key, coin_info)?;
+        let ext_pub_key = match coin_info.curve {
+            CurveType::SR25519 | CurveType::BLS | CurveType::ED25519 => "".to_owned(),
+            _ => root
+                .derive(&get_account_path(&coin_info.derivation_path)?)?
+                .deterministic_public_key()
+                .to_ss58check_with_version(&get_xpub_prefix(&coin_info.network)),
+        };
+
+        let account = Account {
+            address: address.to_string(),
+            derivation_path: coin_info.derivation_path.to_string(),
+            curve: coin_info.curve,
+            coin: coin_info.coin.to_string(),
+            network: coin_info.network.to_string(),
+            ext_pub_key,
+            seg_wit: coin_info.seg_wit.to_string(),
+            public_key: public_key,
+        };
+
+        Ok(account)
+    }
+
+    pub fn identity(&self) -> &Identity {
+        &self.store().identity
+    }
+
+    pub(crate) fn verify_password(&self, key: &Key) -> bool {
+        match key {
+            Key::Password(password) => {
+                return self.store.crypto.verify_password(password);
+            }
+            Key::DerivedKey(derived_key_hex) => {
+                let Ok(derived_key) = Vec::from_hex_auto(derived_key_hex) else {
+                    return false;
+                };
+                return self.store.crypto.verify_derived_key(&derived_key);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::keystore::{metadata_default_time, IdentityNetwork};
+
+    use crate::keystore::tests::MockAddress;
+    use crate::{Keystore, Source};
+    use bitcoin_hashes::hex::ToHex;
+    use std::string::ToString;
+    use tcx_common::FromHex;
+    use tcx_constants::{CurveType, TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_primitive::{PublicKey, Secp256k1PublicKey, TypedPublicKey};
+    use test::Bencher;
+
+    // A mnemonic word separated by a full-width or half-width space
+    static MNEMONIC_WITH_WHITESPACE: &'static str =
+        "inject　 kidney    empty   canal shadow   pact comfort wife crush horse wife sketch";
+    static INVALID_MNEMONIC1: &'static str =
+        "inject kidney empty canal shadow pact comfort wife crush horse wife inject";
+    static INVALID_MNEMONIC2: &'static str =
+        "invalid_word kidney empty canal shadow pact comfort wife crush horse wife sketch";
+    static INVALID_MNEMONIC_LEN: &'static str =
+        "inject kidney empty canal shadow pact comfort wife crush horse wife";
+
+    #[test]
+    fn test_verify_password() {
+        let keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        let derived_key = Keystore::Hd(keystore.clone())
+            .get_derived_key(TEST_PASSWORD)
+            .unwrap();
+        assert!(keystore.verify_password(&Key::Password(TEST_PASSWORD.to_string())));
+        assert!(keystore.verify_password(&Key::DerivedKey(derived_key.to_string())));
+        assert!(!keystore.verify_password(&Key::Password("WRONG PASSWORD".to_string())));
+        assert!(!keystore.verify_password(&Key::DerivedKey("731dd44109f9897eb39980907161b7531be44714352ddaa40542da22fb4fab7533678f2e132226389174faad4e653c542811a7b0c9391ae3cce4e75039a15adc".to_string())));
+    }
+
+    #[test]
+    fn default_meta() {
+        let meta = Metadata::default();
+        let expected = Metadata {
+            name: String::from("Unknown"),
+            password_hint: None,
+            timestamp: metadata_default_time(),
+            source: Source::Mnemonic,
+            network: IdentityNetwork::Mainnet,
+            identified_chain_types: None,
+        };
+
+        assert_eq!(meta.name, expected.name);
+        assert_eq!(meta.password_hint, expected.password_hint);
+        assert_eq!(meta.source, expected.source);
+    }
+
+    #[test]
+    fn test_new_keystore() {
+        let keystore = HdKeystore::new(TEST_PASSWORD, Metadata::default());
+        let store = keystore.store;
+
+        assert_eq!(store.version, 12000);
+        assert_ne!(store.id, "");
+    }
+
+    #[test]
+    fn test_lock_unlock_keystore() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        assert!(!keystore.is_locked());
+        keystore.lock();
+
+        assert!(keystore.is_locked());
+    }
+
+    #[test]
+    fn test_from_invalid_mnemonic() {
+        let invalid_mnemonic = vec![
+            (INVALID_MNEMONIC1, "mnemonic_checksum_invalid"),
+            (INVALID_MNEMONIC2, "mnemonic_word_invalid"),
+            (INVALID_MNEMONIC_LEN, "mnemonic_length_invalid"),
+        ];
+        for (mn, err) in invalid_mnemonic {
+            let ks = HdKeystore::from_mnemonic(mn, TEST_PASSWORD, Metadata::default());
+            assert!(ks.is_err());
+            assert_eq!(err, format!("{}", ks.err().unwrap()));
+        }
+    }
+
+    #[test]
+    fn test_derive_account() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let coin_infos = [
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/86'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/86'/1'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "TESTNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+            },
+            CoinInfo {
+                coin: "TEZOS".to_string(),
+                derivation_path: "m/44'/1729'/0'/0'".to_string(),
+                curve: CurveType::ED25519,
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+            },
+        ];
+
+        let excepts = [
+            "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8",
+            "xpub6Boii2KSAfEv7EhbBuopXKB2Gshi8kMpTGWyHuY9BHwYA8qPeu7ZYdnnXCuUdednhwyjyK2Z8gJD2AfawgBHp3Kkf2GjBjzEQAyJ3uJ4SuG",
+            "xpub6CKMszasQeidek6fYD7g5N1mwUK3ouX8YHWs47MZyXh62GxsEQsU57NuN6GTS3Mh3bwykHGa14617A6HQoYFDSM9deJvgjDeEJxBYsfJ1bs",
+            "xpub6CHyG1anQPWb9ss5CUeZ7cHnvoxqAZNzJBNx6fpxaWPmybH7YbJMxjp4wFp5gnxqX59hCAAbwbQTVTzAbwJsVYgBw4CYU3eAeCGn2tUajR3",
+            "tpubDCpWeoTY6x4BR2PqoTFJnEdfYbjnC4G8VvKoDUPFjt2dvZJWkMRxLST1pbVW56P7zY3L5jq9MRSeff2xsLnvf9qBBN9AgvrhwfZgw5dJG6R",
+            "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv",
+            "tpubDDdrc9EkiHEiTguxsiFmoLVhgtpiqCJQk3zn1vFZPDPfbGvvQBpvsd7eZpiMntvYWGPugWndTrWskkEdyBVSCykDkmd2sCzxyf27fSKWTnB",
+            "tpubDCStmH3ozU1kcGXtRW6e3yE1UoLUehvSGKBFGEjAXeE6Nk9xNWvRySanhaALGsZYU1ivo64CFYHMMdZm1EjM2Vw8uWUBqd77SCL4VCyHSoS",
+            "",
+        ];
+
+        for (i, coin_info) in coin_infos.iter().enumerate() {
+            let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+            assert_eq!(acc.ext_pub_key, excepts[i]);
+        }
+    }
+
+    #[test]
+    fn from_blank_space_mnemonic() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(MNEMONIC_WITH_WHITESPACE, TEST_PASSWORD, Metadata::default())
+                .unwrap();
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+
+        let k1_pub_key = Secp256k1PublicKey::from_slice(
+            &Vec::from_hex_auto(
+                "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            )
+            .unwrap(),
+        )
+        .unwrap();
+        let public_key = TypedPublicKey::Secp256k1(k1_pub_key);
+
+        let expected = Account {
+            address: "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            ext_pub_key: "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            curve: CurveType::SECP256k1,
+            coin: "BITCOIN".to_string(),
+            public_key
+        };
+
+        assert_eq!(acc, expected);
+    }
+
+    #[test]
+    fn test_from_mnemonic() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        assert_eq!(keystore.store.version, 12000);
+        assert_ne!(keystore.store.id, "");
+        let decrypted_bytes = keystore
+            .store
+            .crypto
+            .use_key(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap()
+            .plaintext()
+            .unwrap();
+        let decrypted_mnemonic = String::from_utf8(decrypted_bytes).unwrap();
+        assert_eq!(decrypted_mnemonic, TEST_MNEMONIC);
+
+        keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let mnemonic = keystore.mnemonic().unwrap();
+        assert_eq!(mnemonic, TEST_MNEMONIC);
+
+        let wrong_password_err = keystore
+            .unlock(&Key::Password("WrongPassword".to_owned()))
+            .err()
+            .unwrap();
+        assert_eq!(format!("{}", wrong_password_err), "password_incorrect");
+    }
+
+    #[test]
+    fn test_get_private_key() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let public_key = keystore
+            .get_private_key(CurveType::SECP256k1, "m/44'/118'/0'/0/0'")
+            .unwrap();
+
+        assert_eq!(
+            "49389a85697c8e5ce78fe04d4f6bbf691216ef22101120c73853ba9e4d3105d0",
+            public_key.to_bytes().to_hex()
+        );
+    }
+
+    #[test]
+    fn test_get_deterministic_public_key() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let public_key = keystore
+            .get_deterministic_public_key(CurveType::SECP256k1, "m/44'/118'/0'/0/0'")
+            .unwrap();
+
+        assert_eq!(
+            public_key.to_string(),
+            "xpub6HEP8ZcR5CFi5n4BgzE4NxX4igp2wp1yB68KySjzfMHJy3miEqLbTWFsFHbg8HENKWA64mwnikDSJ8xsf672YwsWuARauMzygaURSjqxGxk"
+        );
+    }
+
+    #[test]
+    fn test_derive_key_at_paths() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+
+        let k1_pub_key = Secp256k1PublicKey::from_slice(
+            &Vec::from_hex_auto(
+                "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            )
+            .unwrap(),
+        )
+        .unwrap();
+        let public_key = TypedPublicKey::Secp256k1(k1_pub_key);
+
+        let expected = Account {
+            address: "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            ext_pub_key: "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            curve: CurveType::SECP256k1,
+            coin: "BITCOIN".to_string(),
+            public_key
+        };
+
+        assert_eq!(acc, expected);
+    }
+
+    #[test]
+    fn test_fingerprint_from_seed() {
+        let seed = mnemonic_to_seed(TEST_MNEMONIC).unwrap();
+        let fingerprint = fingerprint_from_seed(&seed).unwrap();
+        assert_eq!("0x1468dba9c246fe22183c056540ab4d8b04553217", fingerprint);
+
+        let seed = mnemonic_to_seed(
+            "risk outer wing rent aerobic hamster island skin mistake high boost swear",
+        )
+        .unwrap();
+        let fingerprint = fingerprint_from_seed(&seed).unwrap();
+        assert_eq!("0xf6f232595e79dd9723aa4e840d548e792d44aea6", fingerprint);
+    }
+
+    #[test]
+    fn test_fingerprint_from_mnemonic() {
+        let fingerprint = fingerprint_from_mnemonic(TEST_MNEMONIC).unwrap();
+        assert_eq!("0x1468dba9c246fe22183c056540ab4d8b04553217", fingerprint);
+
+        let fingerprint = fingerprint_from_mnemonic(
+            "risk outer wing rent aerobic hamster island skin mistake high boost   swear",
+        )
+        .unwrap();
+        assert_eq!("0xf6f232595e79dd9723aa4e840d548e792d44aea6", fingerprint);
+    }
+
+    #[test]
+    fn test_derive_key_at_paths2() {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+
+        let k1_pub_key = Secp256k1PublicKey::from_slice(
+            &Vec::from_hex_auto(
+                "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            )
+            .unwrap(),
+        )
+        .unwrap();
+        let public_key = TypedPublicKey::Secp256k1(k1_pub_key);
+        let expected = Account {
+            address: "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            ext_pub_key: "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            curve: CurveType::SECP256k1,
+            coin: "BITCOIN".to_string(),
+            public_key
+        };
+
+        assert_eq!(acc, expected);
+    }
+
+    #[bench]
+    fn bench_derive_account(m: &mut Bencher) {
+        let mut keystore =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+
+        m.iter(|| {
+            let account = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+            assert_eq!(account.ext_pub_key, "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8");
+        });
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let mut keystore =
+            HdKeystore::from_mnemonic("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", TEST_PASSWORD, Metadata::default()).unwrap();
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let coin_infos = [
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/44'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/49'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+            },
+            CoinInfo {
+                coin: "BITCOIN".to_string(),
+                derivation_path: "m/84'/0'/0'/0/0".to_string(),
+                curve: CurveType::SECP256k1,
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+            },
+        ];
+
+        let excepts = [
+            "xpub6BosfCnifzxcFwrSzQiqu2DBVTshkCXacvNsWGYJVVhhawA7d4R5WSWGFNbi8Aw6ZRc1brxMyWMzG3DSSSSoekkudhUd9yLb6qx39T9nMdj",
+            "xpub6C6nQwHaWbSrzs5tZ1q7m5R9cPK9eYpNMFesiXsYrgc1P8bvLLAet9JfHjYXKjToD8cBRswJXXbbFpXgwsswVPAZzKMa1jUp2kVkGVUaJa7",
+            "xpub6CatWdiZiodmUeTDp8LT5or8nmbKNcuyvz7WyksVFkKB4RHwCD3XyuvPEbvqAQY3rAPshWcMLoP2fMFMKHPJ4ZeZXYVUhLv1VMrjPC7PW6V",
+            "xpub6CatWdiZiodmUeTDp8LT5or8nmbKNcuyvz7WyksVFkKB4RHwCD3XyuvPEbvqAQY3rAPshWcMLoP2fMFMKHPJ4ZeZXYVUhLv1VMrjPC7PW6V",
+            "xpub6CatWdiZiodmUeTDp8LT5or8nmbKNcuyvz7WyksVFkKB4RHwCD3XyuvPEbvqAQY3rAPshWcMLoP2fMFMKHPJ4ZeZXYVUhLv1VMrjPC7PW6V",
+        ];
+
+        for (i, coin_info) in coin_infos.iter().enumerate() {
+            let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+            assert_eq!(acc.ext_pub_key, excepts[i]);
+        }
+    }
+
+    #[test]
+    fn test_bip49_spec_vertors() {
+        let mut keystore =
+            HdKeystore::from_mnemonic("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", TEST_PASSWORD, Metadata::default()).unwrap();
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/49'/1'/0'".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(acc.ext_pub_key, "tpubDD7tXK8KeQ3YY83yWq755fHY2JW8Ha8Q765tknUM5rSvjPcGWfUppDFMpQ1ScziKfW3ZNtZvAD7M3u7bSs7HofjTD3KP3YxPK7X6hwV8Rk2");
+
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/49'/1'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(
+            acc.address,
+            "03a1af804ac108a8a51782198c2d034b28bf90c8803f5a53f76276fa69a4eae77f"
+        );
+    }
+
+    #[test]
+    fn test_bip84_spec_vertors() {
+        let mut keystore =
+            HdKeystore::from_mnemonic("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", TEST_PASSWORD, Metadata::default()).unwrap();
+        let _ = keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let mut coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/84'/0'/0'".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(acc.ext_pub_key, "xpub6CatWdiZiodmUeTDp8LT5or8nmbKNcuyvz7WyksVFkKB4RHwCD3XyuvPEbvqAQY3rAPshWcMLoP2fMFMKHPJ4ZeZXYVUhLv1VMrjPC7PW6V");
+
+        coin_info.derivation_path = "m/84'/0'/0'/0/0".to_string();
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(
+            acc.address,
+            "0330d54fd0dd420a6e5f8d3624f5f3482cae350f79d5f0753bf5beef9c2d91af3c"
+        );
+
+        coin_info.derivation_path = "m/84'/0'/0'/0/1".to_string();
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(
+            acc.address,
+            "03e775fd51f0dfb8cd865d9ff1cca2a158cf651fe997fdc9fee9c1d3b5e995ea77"
+        );
+
+        coin_info.derivation_path = "m/84'/0'/0'/1/0".to_string();
+        let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(
+            acc.address,
+            "03025324888e429ab8e3dbaf1f7802648b9cd01e9b418485c5fa4c1b9b5700e1a6"
+        );
+    }
+}
diff --git a/token-core/tcx-keystore/src/keystore/mod.rs b/token-core/tcx-keystore/src/keystore/mod.rs
new file mode 100644
index 00000000..977d9c0f
--- /dev/null
+++ b/token-core/tcx-keystore/src/keystore/mod.rs
@@ -0,0 +1,1099 @@
+use super::{Result, Signer};
+use std::fmt;
+use std::str::FromStr;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+mod guard;
+mod hd;
+mod private;
+
+use serde::{Deserialize, Serialize};
+
+use tcx_common::ToHex;
+use tcx_constants::{CoinInfo, CurveType};
+
+pub use self::{
+    guard::KeystoreGuard, hd::fingerprint_from_mnemonic, hd::fingerprint_from_seed,
+    hd::mnemonic_to_seed, hd::HdKeystore, private::fingerprint_from_private_key,
+    private::PrivateKeystore,
+};
+
+use crate::identity::Identity;
+use tcx_crypto::{Crypto, EncPair, Key};
+use tcx_primitive::{Derive, TypedDeterministicPublicKey, TypedPrivateKey, TypedPublicKey};
+
+use anyhow::anyhow;
+use thiserror::Error;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Store {
+    pub id: String,
+    pub version: i64,
+    pub source_fingerprint: String,
+    pub crypto: Crypto,
+    pub identity: Identity,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub curve: Option<CurveType>,
+    pub enc_original: EncPair,
+    #[serde(rename = "imTokenMeta")]
+    pub meta: Metadata,
+}
+
+#[derive(Error, Debug, PartialEq)]
+pub enum Error {
+    #[error("mnemonic_invalid")]
+    MnemonicInvalid,
+    #[error("mnemonic_word_invalid")]
+    MnemonicWordInvalid,
+    #[error("mnemonic_length_invalid")]
+    MnemonicLengthInvalid,
+    #[error("mnemonic_checksum_invalid")]
+    MnemonicChecksumInvalid,
+    #[error("account_not_found")]
+    AccountNotFound,
+    #[error("can_not_derive_key")]
+    CannotDeriveKey,
+    #[error("keystore_locked")]
+    KeystoreLocked,
+    #[error("invalid_version")]
+    InvalidVersion,
+    #[error("pkstore_can_not_add_other_curve_account")]
+    PkstoreCannotAddOtherCurveAccount,
+}
+
+fn transform_mnemonic_error(err: anyhow::Error) -> Error {
+    let err = err.downcast::<bip39::ErrorKind>();
+    if let Ok(err) = err {
+        match err {
+            bip39::ErrorKind::InvalidChecksum => Error::MnemonicChecksumInvalid,
+            bip39::ErrorKind::InvalidWord => Error::MnemonicWordInvalid,
+            bip39::ErrorKind::InvalidWordLength(_) => Error::MnemonicLengthInvalid,
+            _ => Error::MnemonicInvalid,
+        }
+    } else {
+        Error::MnemonicInvalid
+    }
+}
+
+/// Account that presents one blockchain wallet on a fixtures
+#[derive(Debug, Clone, PartialEq)]
+pub struct Account {
+    pub address: String,
+    pub derivation_path: String,
+    pub curve: CurveType,
+    pub coin: String,
+    pub network: String,
+    pub seg_wit: String,
+    pub ext_pub_key: String,
+    pub public_key: TypedPublicKey,
+}
+
+pub trait PublicKeyEncoder: Sized + Clone + PartialEq + Eq {
+    fn encode(public_key: &TypedPublicKey, coin_info: &CoinInfo) -> Result<String>;
+}
+
+/// Chain address interface, for encapsulate derivation
+pub trait Address: ToString + FromStr + Sized + Clone + PartialEq + Eq {
+    // Incompatible between the trait `Address:PubKey is not implemented for `&<impl curve::PrivateKey as curve::PrivateKey>::PublicKey`
+    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<Self>;
+
+    fn is_valid(address: &str, coin: &CoinInfo) -> bool;
+}
+
+/// Source to remember which format it comes from
+///
+/// NOTE: Identity related type is only for imToken App v2.x
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum Source {
+    Wif,
+    Private,
+    KeystoreV3,
+    SubstrateKeystore,
+    Mnemonic,
+    NewMnemonic,
+}
+
+impl FromStr for Source {
+    type Err = anyhow::Error;
+
+    fn from_str(input: &str) -> std::result::Result<Source, Self::Err> {
+        match input {
+            "WIF" => Ok(Source::Wif),
+            "PRIVATE" => Ok(Source::Private),
+            "KEYSTORE_V3" => Ok(Source::KeystoreV3),
+            "SUBSTRATE_KEYSTORE" => Ok(Source::SubstrateKeystore),
+            "MNEMONIC" => Ok(Source::Mnemonic),
+            "NEW_MNEMONIC" => Ok(Source::NewMnemonic),
+            _ => Err(anyhow!("unknown_source")),
+        }
+    }
+}
+impl fmt::Display for Source {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Source::Wif => write!(f, "WIF"),
+            Source::Private => write!(f, "PRIVATE"),
+            Source::KeystoreV3 => write!(f, "KEYSTORE_V3"),
+            Source::SubstrateKeystore => write!(f, "SUBSTRATE_KEYSTORE"),
+            Source::Mnemonic => write!(f, "MNEMONIC"),
+            Source::NewMnemonic => write!(f, "NEW_MNEMONIC"),
+        }
+    }
+}
+
+/// Source to remember which format it comes from
+///
+/// NOTE: Identity related type is only for imToken App v2.x
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum IdentityNetwork {
+    Mainnet,
+    Testnet,
+}
+
+impl FromStr for IdentityNetwork {
+    type Err = anyhow::Error;
+
+    fn from_str(input: &str) -> std::result::Result<IdentityNetwork, Self::Err> {
+        match input {
+            "MAINNET" => Ok(IdentityNetwork::Mainnet),
+            "TESTNET" => Ok(IdentityNetwork::Testnet),
+            _ => Err(anyhow!("unknown_identify_network")),
+        }
+    }
+}
+
+impl fmt::Display for IdentityNetwork {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            IdentityNetwork::Mainnet => write!(f, "MAINNET"),
+            IdentityNetwork::Testnet => write!(f, "TESTNET"),
+        }
+    }
+}
+
+/// Metadata of fixtures, for presenting wallet data
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Metadata {
+    pub name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub password_hint: Option<String>,
+    #[serde(default = "metadata_default_time")]
+    pub timestamp: i64,
+    #[serde(default = "metadata_default_source")]
+    pub source: Source,
+    #[serde(default = "metadata_default_network")]
+    pub network: IdentityNetwork,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub identified_chain_types: Option<Vec<String>>,
+}
+
+fn metadata_default_time() -> i64 {
+    let start = SystemTime::now();
+    let since_the_epoch = start.duration_since(UNIX_EPOCH).expect("get timestamp");
+    since_the_epoch.as_secs() as i64
+}
+
+fn metadata_default_source() -> Source {
+    Source::Mnemonic
+}
+
+fn metadata_default_network() -> IdentityNetwork {
+    IdentityNetwork::Mainnet
+}
+
+impl Default for Metadata {
+    fn default() -> Self {
+        Metadata {
+            name: String::from("Unknown"),
+            password_hint: None,
+            timestamp: metadata_default_time(),
+            source: Source::Mnemonic,
+            network: IdentityNetwork::Mainnet,
+            identified_chain_types: None,
+        }
+    }
+}
+
+#[derive(Clone)]
+pub enum Keystore {
+    PrivateKey(PrivateKeystore),
+    Hd(HdKeystore),
+}
+
+impl Keystore {
+    pub fn from_private_key(
+        private_key: &str,
+        password: &str,
+        curve: CurveType,
+        meta: Metadata,
+        original: Option<String>,
+    ) -> Result<Keystore> {
+        Ok(Keystore::PrivateKey(PrivateKeystore::from_private_key(
+            private_key,
+            password,
+            curve,
+            meta,
+            original,
+        )?))
+    }
+
+    pub fn from_mnemonic(mnemonic: &str, password: &str, metadata: Metadata) -> Result<Keystore> {
+        Ok(Keystore::Hd(HdKeystore::from_mnemonic(
+            mnemonic, password, metadata,
+        )?))
+    }
+
+    pub fn id(&self) -> String {
+        self.store().id.to_string()
+    }
+
+    pub fn set_id(&mut self, id: &str) {
+        self.store_mut().id = id.to_string()
+    }
+
+    pub fn store(&self) -> &Store {
+        match self {
+            Keystore::PrivateKey(ks) => ks.store(),
+            Keystore::Hd(ks) => ks.store(),
+        }
+    }
+
+    pub fn store_mut(&mut self) -> &mut Store {
+        match self {
+            Keystore::PrivateKey(ks) => ks.store_mut(),
+            Keystore::Hd(ks) => ks.store_mut(),
+        }
+    }
+
+    pub fn meta(&self) -> Metadata {
+        self.store().meta.clone()
+    }
+
+    pub fn fingerprint(&self) -> &str {
+        &self.store().source_fingerprint
+    }
+
+    pub fn unlock_by_password(&mut self, password: &str) -> Result<()> {
+        self.unlock(&Key::Password(password.to_owned()))
+    }
+
+    pub fn unlock_by_derived_key(&mut self, derived_key: &str) -> Result<()> {
+        self.unlock(&Key::DerivedKey(derived_key.to_owned()))
+    }
+
+    pub fn unlock(&mut self, key: &Key) -> Result<()> {
+        match self {
+            Keystore::PrivateKey(ks) => ks.unlock(key),
+            Keystore::Hd(ks) => ks.unlock(key),
+        }
+    }
+
+    pub fn get_derived_key(&mut self, password: &str) -> Result<String> {
+        Ok(self
+            .store_mut()
+            .crypto
+            .use_key(&Key::Password(password.to_owned()))?
+            .derived_key()
+            .to_hex())
+    }
+
+    pub fn is_locked(&self) -> bool {
+        match self {
+            Keystore::PrivateKey(ks) => ks.is_locked(),
+            Keystore::Hd(ks) => ks.is_locked(),
+        }
+    }
+
+    pub fn derivable(&self) -> bool {
+        match self {
+            Keystore::PrivateKey(_) => false,
+            Keystore::Hd(_) => true,
+        }
+    }
+
+    pub fn export(&self) -> Result<String> {
+        match self {
+            Keystore::PrivateKey(pk_store) => pk_store.private_key(),
+            Keystore::Hd(hd_store) => hd_store.mnemonic(),
+        }
+    }
+
+    pub fn lock(&mut self) {
+        match self {
+            Keystore::PrivateKey(ks) => ks.lock(),
+            Keystore::Hd(ks) => ks.lock(),
+        }
+    }
+
+    pub fn derive_coin<A: Address>(&mut self, coin_info: &CoinInfo) -> Result<Account> {
+        match self {
+            Keystore::PrivateKey(ks) => ks.derive_coin::<A>(coin_info),
+            Keystore::Hd(ks) => ks.derive_coin::<A>(coin_info),
+        }
+    }
+
+    pub fn derive_coins<A: Address>(&mut self, coin_infos: &[CoinInfo]) -> Result<Vec<Account>> {
+        let mut accounts = vec![];
+
+        for coin_info in coin_infos {
+            accounts.push(self.derive_coin::<A>(coin_info)?);
+        }
+
+        Ok(accounts)
+    }
+
+    pub fn derive_sub_account<A: Address>(
+        xpub: &TypedDeterministicPublicKey,
+        coin_info: &CoinInfo,
+    ) -> Result<Account> {
+        let typed_pk = xpub.derive(&coin_info.derivation_path)?.public_key();
+        let address = A::from_public_key(&typed_pk, coin_info)?.to_string();
+        let account = Account {
+            address,
+            derivation_path: coin_info.derivation_path.to_string(),
+            curve: coin_info.curve,
+            coin: coin_info.coin.to_string(),
+            network: coin_info.network.to_string(),
+            seg_wit: coin_info.seg_wit.to_string(),
+            ext_pub_key: xpub.to_string(),
+            public_key: typed_pk,
+        };
+        Ok(account)
+    }
+
+    pub fn get_private_key(
+        &mut self,
+        curve: CurveType,
+        derivation_path: &str,
+    ) -> Result<TypedPrivateKey> {
+        match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(curve),
+            Keystore::Hd(ks) => ks.get_private_key(curve, derivation_path),
+        }
+    }
+
+    pub fn get_public_key(
+        &mut self,
+        curve: CurveType,
+        derivation_path: &str,
+    ) -> Result<TypedPublicKey> {
+        let private_key = match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(curve)?,
+            Keystore::Hd(ks) => ks.get_private_key(curve, derivation_path)?,
+        };
+
+        Ok(private_key.public_key())
+    }
+
+    pub fn get_curve(&self) -> Option<CurveType> {
+        self.store().curve.clone()
+    }
+
+    pub fn get_deterministic_public_key(
+        &mut self,
+        curve: CurveType,
+        derivation_path: &str,
+    ) -> Result<TypedDeterministicPublicKey> {
+        match self {
+            Keystore::Hd(ks) => ks.get_deterministic_public_key(curve, derivation_path),
+            _ => Err(Error::CannotDeriveKey.into()),
+        }
+    }
+
+    pub fn backup(&self, key: &Key) -> Result<String> {
+        let unlocker = self.store().crypto.use_key(key)?;
+        let decrypted = unlocker.decrypt_enc_pair(&self.store().enc_original)?;
+        let original = String::from_utf8_lossy(&decrypted);
+        Ok(original.to_string())
+    }
+
+    pub fn identity(&self) -> &Identity {
+        &self.store().identity
+    }
+
+    pub fn verify_password(&self, key: &Key) -> bool {
+        match self {
+            Keystore::PrivateKey(ks) => ks.verify_password(key),
+            Keystore::Hd(ks) => ks.verify_password(key),
+        }
+    }
+
+    pub fn from_json(json: &str) -> Result<Keystore> {
+        let store: Store = serde_json::from_str(json)?;
+
+        match store.version {
+            HdKeystore::VERSION => Ok(Keystore::Hd(HdKeystore::from_store(store))),
+            PrivateKeystore::VERSION => {
+                Ok(Keystore::PrivateKey(PrivateKeystore::from_store(store)))
+            }
+
+            _ => Err(Error::InvalidVersion.into()),
+        }
+    }
+
+    pub fn to_json(&self) -> String {
+        match self {
+            Keystore::PrivateKey(ks) => serde_json::to_string(ks.store()).unwrap(),
+            Keystore::Hd(ks) => serde_json::to_string(ks.store()).unwrap(),
+        }
+    }
+}
+
+impl Signer for Keystore {
+    fn sign_hash(
+        &mut self,
+        hash: &[u8],
+        derivation_path: &str,
+        curve: &str,
+        sig_alg: &str,
+    ) -> Result<Vec<u8>> {
+        match (curve, sig_alg.to_uppercase().as_str()) {
+            ("secp256k1", "ECDSA") => self.secp256k1_ecdsa_sign_recoverable(hash, derivation_path),
+            ("bls12-381", dst) => self.bls_sign(hash, derivation_path, dst),
+            ("ed25519", _) => self.ed25519_sign(hash, derivation_path),
+            ("sr25519", _) => self.sr25519_sign(hash, derivation_path),
+            (_, _) => Err(anyhow!("unsupported curve: {} sig_alg: {}", curve, sig_alg)),
+        }
+    }
+
+    fn secp256k1_ecdsa_sign_recoverable(
+        &mut self,
+        hash: &[u8],
+        derivation_path: &str,
+    ) -> Result<Vec<u8>> {
+        let private_key = match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(CurveType::SECP256k1)?,
+            Keystore::Hd(ks) => ks.get_private_key(CurveType::SECP256k1, derivation_path)?,
+        };
+
+        private_key.as_secp256k1()?.sign_recoverable(hash)
+    }
+
+    fn secp256k1_ecdsa_sign_recoverable_with_noncedata(
+        &mut self,
+        hash: &[u8],
+        derivation_path: &str,
+        noncedata: &[u8; 32],
+    ) -> Result<Vec<u8>> {
+        let private_key = match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(CurveType::SECP256k1)?,
+            Keystore::Hd(ks) => ks.get_private_key(CurveType::SECP256k1, derivation_path)?,
+        };
+
+        private_key
+            .as_secp256k1()?
+            .sign_recoverable_with_noncedata(hash, noncedata)
+    }
+
+    fn bls_sign(&mut self, hash: &[u8], derivation_path: &str, dst: &str) -> Result<Vec<u8>> {
+        let private_key = match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(CurveType::BLS)?,
+            Keystore::Hd(ks) => ks.get_private_key(CurveType::BLS, derivation_path)?,
+        };
+
+        private_key.as_bls()?.sign(hash, dst)
+    }
+
+    fn sr25519_sign(&mut self, hash: &[u8], derivation_path: &str) -> Result<Vec<u8>> {
+        let private_key = match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(CurveType::SR25519)?,
+            Keystore::Hd(ks) => ks.get_private_key(CurveType::SR25519, derivation_path)?,
+        };
+
+        private_key.as_sr25519()?.sign(hash)
+    }
+
+    fn ed25519_sign(&mut self, hash: &[u8], derivation_path: &str) -> Result<Vec<u8>> {
+        let private_key = match self {
+            Keystore::PrivateKey(ks) => ks.get_private_key(CurveType::ED25519)?,
+            Keystore::Hd(ks) => ks.get_private_key(CurveType::ED25519, derivation_path)?,
+        };
+
+        private_key.as_ed25519()?.sign(hash)
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use crate::keystore::Keystore::{Hd, PrivateKey};
+    use crate::{
+        Address, HdKeystore, Keystore, Metadata, PrivateKeystore, SignatureParameters, Signer,
+        Source,
+    };
+    use anyhow::anyhow;
+    use serde_json::Value;
+    use std::str::FromStr;
+
+    use crate::keystore::{
+        metadata_default_network, metadata_default_source, transform_mnemonic_error, Error,
+        IdentityNetwork,
+    };
+    use crate::Result;
+    use tcx_common::{FromHex, ToHex};
+
+    use tcx_constants::{CoinInfo, CurveType, TEST_MNEMONIC, TEST_PASSWORD, TEST_PRIVATE_KEY};
+    use tcx_crypto::Key;
+    use tcx_primitive::{
+        PublicKey, Secp256k1PublicKey, Ss58Codec, TypedDeterministicPublicKey, TypedPublicKey,
+    };
+
+    #[derive(Clone, PartialEq, Eq)]
+    pub(crate) struct MockAddress(Vec<u8>);
+    impl Address for MockAddress {
+        fn from_public_key(pk: &TypedPublicKey, _coin: &CoinInfo) -> Result<Self> {
+            Ok(MockAddress(pk.to_bytes()))
+        }
+
+        fn is_valid(_address: &str, _coin: &CoinInfo) -> bool {
+            true
+        }
+    }
+
+    impl FromStr for MockAddress {
+        type Err = anyhow::Error;
+        fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+            Ok(MockAddress(Vec::from_hex(s).unwrap()))
+        }
+    }
+
+    impl ToString for MockAddress {
+        fn to_string(&self) -> String {
+            self.0.to_hex()
+        }
+    }
+
+    static HD_KEYSTORE_JSON: &'static str = r#"
+        {
+    "id": "7719d1e3-3f67-439f-a18e-d9ae413e00e1",
+    "version": 12000,
+    "sourceFingerprint": "0xefbe00a55ddd4c5350e295a9533d28f93cac001bfdad8cf4275140461ea03e9e",
+    "crypto": {
+        "cipher": "aes-128-ctr",
+        "cipherparams": {
+            "iv": "6006bd4e828f2f93dca31e36590ca4c9"
+        },
+        "ciphertext": "b06b82b8cda0bc72761177b312dfd46318248ad8473b6c97d46c44aedf6a283f44f0267dd03f210dcddf4ea1a34f85b0b02533dd9c37ce2276cb087af3e43f2a76b968e17c816ca8ea5c",
+        "kdf": "pbkdf2",
+        "kdfparams": {
+            "c": 10240,
+            "prf": "hmac-sha256",
+            "dklen": 32,
+            "salt": "5d85aaf812a613f810cc1cda18d35f46c013f5e537629e25372969f5f87402cd"
+        },
+        "mac": "56af7c5faf0a791cbb4911c4c20070156e4ad0a03f8253b2a2fb005a68d7a026"
+    },
+    "encOriginal":
+            {
+                "encStr":"ba382601567c543984778a7914d7bfb2462098a8680f36edd7ceaa1a5039e1ca",
+                "nonce":"d117ae86c627850341f1a5d6bd9cd855"
+            },
+    "identity":{
+        "encAuthKey":
+            {
+                "encStr":"ba382601567c543984778a7914d7bfb2462098a8680f36edd7ceaa1a5039e1ca",
+                "nonce":"d117ae86c627850341f1a5d6bd9cd855"
+            },
+        "encKey":"ef806a542bcc30da7ce60fc37bd6cc91619b482f6f070af3a9d7b042087886f3",
+        "identifier":"im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf",
+        "ipfsId":"QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6"
+    },
+    "imTokenMeta": {
+        "name": "test-wallet",
+        "passwordHint": "imtoken",
+        "timestamp": 1575605134,
+        "source": "MNEMONIC",
+        "network":"MAINNET"
+    }
+}
+"#;
+
+    static PK_KEYSTORE_JSON: &'static str = r#"
+    {"id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b","version":12001,
+    "sourceFingerprint":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},"identity":{"encAuthKey":{"encStr":"ba382601567c543984778a7914d7bfb2462098a8680f36edd7ceaa1a5039e1ca","nonce":"d117ae86c627850341f1a5d6bd9cd855"},"encKey":"ef806a542bcc30da7ce60fc37bd6cc91619b482f6f070af3a9d7b042087886f3","identifier":"im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf","ipfsId":"QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6"},"encOriginal":{"encStr":"ba382601567c543984778a7914d7bfb2462098a8680f36edd7ceaa1a5039e1ca","nonce":"d117ae86c627850341f1a5d6bd9cd855"}, "imTokenMeta":{"name":"Unknown","passwordHint":"","timestamp":1576733295,"source":"PRIVATE","network":"MAINNET"},
+    "curve": "secp256k1"
+    }
+    "#;
+
+    static INVALID_PK_KEYSTORE_JSON: &'static str = r#"
+    {"id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b","version":10001,"sourceFingerprint":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},"identity":{"encAuthKey":{"encStr":"ba382601567c543984778a7914d7bfb2462098a8680f36edd7ceaa1a5039e1ca","nonce":"d117ae86c627850341f1a5d6bd9cd855"},"encKey":"ef806a542bcc30da7ce60fc37bd6cc91619b482f6f070af3a9d7b042087886f3","identifier":"im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf","ipfsId":"QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6"},"encOriginal":{"encStr":"ba382601567c543984778a7914d7bfb2462098a8680f36edd7ceaa1a5039e1ca","nonce":"d117ae86c627850341f1a5d6bd9cd855"}, "imTokenMeta":{"name":"Unknown","passwordHint":"","timestamp":1576733295,"source":"PRIVATE","network":"MAINNET"}}
+    "#;
+
+    static OLD_KEYSTORE_JSON: &'static str = r#"
+    {
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "437ef8c8553df9910ad117ecec5b8c05"
+    },
+    "ciphertext": "acabec2bd6fab27d867ebabe0ded9c64c85aebd294d29ecf537e563474ebb931522dbb977e0644830516550255edde02c507863cb083b55f2f0f759c2f8a885a81a6518237e7b65b7cf3e912fb36e42a13a7b2df3d401e5ff778a412a6d4c5516645770c4b12f2e30551542c699eef",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "33c8f2d27fe994a1e7d51108c7811cdaa2b821cc6760ed760954b4b67a1bcd8c"
+    },
+    "mac": "6b86a18f4ba9f3f428e256e72a3d832dcf0cd1cb820ec61e413a64d83b012059"
+  },
+  "id": "02a55ab6-554a-4e78-bc26-6a7acced7e5e",
+  "version": 44,
+  "address": "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN",
+  "encMnemonic": {
+    "encStr": "840fad94f4bf4128f629bc1dec731d156283cc4099e3c7659a3bf382031443fcdce6debaaef444393c446d2b4007064c010f6a442b3ad0ff0851c1bd638ba251afa92d3106457bd78c49",
+    "nonce": "4d691a7f0cb6396e96e8dc3e4f35dccd"
+  },
+  "info": {
+    "curve": "spec256k1",
+    "purpuse": "sign"
+  },
+  "mnemonicPath": "m/44'/1'/0'",
+  "xpub": "tpubDCpWeoTY6x4BR2PqoTFJnEdfYbjnC4G8VvKoDUPFjt2dvZJWkMRxLST1pbVW56P7zY3L5jq9MRSeff2xsLnvf9qBBN9AgvrhwfZgw5dJG6R",
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "BITCOIN",
+    "network": "TESTNET",
+    "name": "BTC",
+    "passwordHint": "",
+    "source": "RECOVERED_IDENTITY",
+    "walletType": "HD",
+    "timestamp": 1519611221,
+    "segWit": "NONE"
+  }
+}
+    "#;
+
+    #[test]
+    fn test_json() {
+        let keystore: Keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
+        assert_eq!(
+            Value::from_str(&keystore.to_json()).unwrap(),
+            Value::from_str(HD_KEYSTORE_JSON).unwrap()
+        );
+
+        let keystore: Keystore = Keystore::from_json(PK_KEYSTORE_JSON).unwrap();
+        assert_eq!(
+            Value::from_str(&keystore.to_json()).unwrap(),
+            Value::from_str(PK_KEYSTORE_JSON).unwrap()
+        );
+
+        let ret = Keystore::from_json(OLD_KEYSTORE_JSON);
+        assert!(ret.is_err());
+    }
+
+    #[test]
+    fn test_hd_sign_hash() {
+        let msg = Vec::from_hex("645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76")
+            .unwrap();
+        let mut keystore: Keystore =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        let params = SignatureParameters {
+            curve: CurveType::SECP256k1,
+            chain_type: "BITCOINCASH".to_string(),
+            derivation_path: "m/44'/145'/0'/0/2".to_string(),
+            ..Default::default()
+        };
+
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+
+        let ret = keystore
+            .secp256k1_ecdsa_sign_recoverable(&msg, &params.derivation_path)
+            .unwrap();
+        assert_eq!("a5c14ac7fd46f9f0c951b86d9586595270266ab09b49bf79fc27ebae786625606a7d7841fb740ee190c94dcd156228fc820f5ff5ba8c07748b220d07c51d247a01", ret.to_hex());
+
+        let ret = keystore
+            .sign_hash(
+                &msg,
+                &params.derivation_path,
+                CurveType::SECP256k1.as_str(),
+                "ECDSA",
+            )
+            .unwrap();
+        assert_eq!("a5c14ac7fd46f9f0c951b86d9586595270266ab09b49bf79fc27ebae786625606a7d7841fb740ee190c94dcd156228fc820f5ff5ba8c07748b220d07c51d247a01", ret.to_hex());
+
+        /*        let ret = keystore.sign_hash(&msg, "m/44'/0'/0'/0'/0'", "bls12-381", "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_").unwrap();
+               assert_eq!("", ret.to_hex());
+
+
+               let ret = keystore.sign_hash(&msg, &params.derivation_path, "bls12-381", "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_").unwrap();
+               assert_eq!("", ret.to_hex());
+
+        */
+
+        /*        let mut keystore: Keystore = Keystore::from_json(PK_KEYSTORE_JSON).unwrap();
+               let ret = keystore.secp256k1_ecdsa_sign_recoverable(&msg, "m/44'/195'/0'/0/0");
+               assert!(ret.is_err());
+               assert_eq!(format!("{}", ret.err().unwrap()), "keystore_locked");
+
+               let _ = keystore.unlock_by_password("imtoken1");
+               let msg = Vec::from_hex("645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76")
+                   .unwrap();
+
+               let ret = keystore
+                   .secp256k1_ecdsa_sign_recoverable(&msg, "m/44'/195'/0'/0/0")
+                   .unwrap();
+               assert_eq!(hex::encode(ret), "8d4920cb3a5a46a3f76845e823c9531f4a882eac4ffd61bfeaa29646999a83d35c4c5537816911a8b0eb5f0e7ea09839c37e9e22bace8404d23d064c84d403d500");
+
+        */
+    }
+
+    #[test]
+    fn test_keystore_non_sensitive() {
+        let mut keystore = Keystore::from_json(HD_KEYSTORE_JSON).unwrap();
+        assert_eq!(keystore.id(), "7719d1e3-3f67-439f-a18e-d9ae413e00e1");
+        keystore.set_id("test_set_id");
+        assert_eq!("test_set_id", keystore.id());
+        assert_eq!("test-wallet", keystore.meta().name);
+        assert!(keystore.derivable());
+        assert_eq!(
+            "0xefbe00a55ddd4c5350e295a9533d28f93cac001bfdad8cf4275140461ea03e9e",
+            keystore.fingerprint()
+        );
+    }
+
+    #[test]
+    fn test_keystore_unlock() {
+        let mut keystore =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        let export_ret = keystore.export();
+        assert!(export_ret.is_err());
+        assert_eq!(format!("{}", export_ret.err().unwrap()), "keystore_locked");
+
+        let unlocked_ret = keystore.unlock_by_password("WRONG PASSWORD");
+        assert!(unlocked_ret.is_err());
+        assert_eq!(
+            format!("{}", unlocked_ret.err().unwrap()),
+            "password_incorrect"
+        );
+
+        let derived_key = keystore.get_derived_key(TEST_PASSWORD).unwrap();
+        assert!(keystore.verify_password(&Key::Password(TEST_PASSWORD.to_string())));
+        assert!(keystore.verify_password(&Key::DerivedKey(derived_key.to_string())));
+        assert!(!keystore.verify_password(&Key::Password("WRONG PASSWORD".to_string())));
+        assert!(!keystore.verify_password(&Key::DerivedKey("731dd44109f9897eb39980907161b7531be44714352ddaa40542da22fb4fab7533678f2e132226389174faad4e653c542811a7b0c9391ae3cce4e75039a15adc".to_string())));
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        assert_eq!(
+            "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+            keystore.export().unwrap()
+        );
+
+        keystore.lock();
+        let export_ret = keystore.export();
+        assert!(export_ret.is_err());
+        assert_eq!(format!("{}", export_ret.err().unwrap()), "keystore_locked");
+    }
+
+    #[test]
+    fn test_hd_get_key() {
+        let mut keystore =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        let pk = keystore
+            .get_private_key(CurveType::SECP256k1, "m/44'/0'/0'/0/0")
+            .unwrap();
+        assert!(pk.as_secp256k1().is_ok());
+
+        assert_eq!(
+            pk.as_secp256k1()
+                .unwrap()
+                .to_ss58check_with_version(&[0x80]),
+            "KxBhnk7DGkXY7Fsw4MaRGXtHrmeqpxxc6u1Rr9aGjNQhH514gkU4"
+        );
+
+        let public_key = keystore
+            .get_deterministic_public_key(CurveType::SECP256k1, "m/44'/0'/0'/0/0")
+            .unwrap();
+        assert_eq!(
+            public_key.to_hex(),
+            "0543ed2f690000000024027546ee9ddc756de6e83d93e74f4d0d2751de1e209fdcc1d07b4185dace25026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868"
+        );
+    }
+
+    #[test]
+    fn test_pk_get_key() {
+        let mut keystore = Keystore::from_json(PK_KEYSTORE_JSON).unwrap();
+        keystore.unlock_by_password("imtoken1").unwrap();
+        let pk = keystore.get_private_key(CurveType::SECP256k1, "").unwrap();
+        assert_eq!(
+            pk.to_bytes().to_hex(),
+            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6"
+        );
+
+        let ret = keystore.get_deterministic_public_key(CurveType::SECP256k1, "m/44'/60'/0/0");
+        assert!(ret.is_err())
+    }
+
+    #[test]
+    fn test_create() {
+        let hd_store = HdKeystore::new(TEST_PASSWORD, Metadata::default());
+        let keystore = Hd(hd_store);
+        assert!(keystore.derivable());
+
+        let hd_store =
+            HdKeystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+        let keystore = Hd(hd_store);
+        assert!(keystore.derivable());
+        assert_eq!(
+            keystore.fingerprint(),
+            "0x1468dba9c246fe22183c056540ab4d8b04553217"
+        );
+
+        let meta = Metadata {
+            name: "test_create".to_string(),
+            password_hint: Some(TEST_PASSWORD.to_string()),
+            source: Source::Private,
+            ..Metadata::default()
+        };
+        let pk_store = PrivateKeystore::from_private_key(
+            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            meta,
+            None,
+        )
+        .unwrap();
+        let keystore = PrivateKey(pk_store);
+        assert!(!keystore.derivable());
+
+        let ret = HdKeystore::from_mnemonic(
+            format!("{} hello", TEST_MNEMONIC).as_str(),
+            TEST_PASSWORD,
+            Metadata::default(),
+        );
+        assert!(ret.is_err())
+    }
+
+    #[test]
+    fn test_metadata_default() {
+        assert_eq!(metadata_default_source(), Source::Mnemonic);
+        assert_eq!(metadata_default_network(), IdentityNetwork::Mainnet);
+    }
+
+    #[test]
+    fn test_hd_keystore() {
+        let mut keystore =
+            Keystore::from_mnemonic(TEST_MNEMONIC, TEST_PASSWORD, Metadata::default()).unwrap();
+
+        assert!(keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .is_ok());
+
+        assert!(keystore.derivable());
+        assert!(!keystore.is_locked());
+        assert_ne!(keystore.identity().ipfs_id, "");
+        assert!(keystore.identity().identifier.starts_with("im"));
+        assert_eq!(keystore.meta().name, "Unknown");
+        assert_ne!(keystore.id(), "");
+        let derived_key = keystore.get_derived_key(TEST_PASSWORD).unwrap();
+        assert!(keystore.verify_password(&Key::Password(TEST_PASSWORD.to_string())));
+        assert!(keystore.verify_password(&Key::DerivedKey(derived_key.to_string())));
+        assert!(!keystore.verify_password(&Key::Password("WRONG PASSWORD".to_string())));
+        assert!(!keystore.verify_password(&Key::DerivedKey("731dd44109f9897eb39980907161b7531be44714352ddaa40542da22fb4fab7533678f2e132226389174faad4e653c542811a7b0c9391ae3cce4e75039a15adc".to_string())));
+
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+
+        let k1_pub_key = Secp256k1PublicKey::from_slice(
+            &Vec::from_hex_auto(
+                "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            )
+            .unwrap(),
+        )
+        .unwrap();
+        let public_key = TypedPublicKey::Secp256k1(k1_pub_key);
+
+        let account = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(public_key, account.public_key);
+        assert_eq!(account.curve, CurveType::SECP256k1);
+
+        let accounts = keystore.derive_coins::<MockAddress>(&[coin_info]).unwrap();
+        assert_eq!(accounts.len(), 1);
+        assert_eq!(public_key, accounts[0].public_key);
+        assert_eq!(accounts[0].curve, CurveType::SECP256k1);
+
+        let public_key = keystore
+            .get_public_key(CurveType::SECP256k1, "m/44'/0'/0'/0/0")
+            .unwrap();
+        assert_eq!(
+            "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            public_key.to_bytes().to_hex()
+        );
+
+        let deterministic_public_key = keystore
+            .get_deterministic_public_key(CurveType::SECP256k1, "m/44'/0'/0'")
+            .unwrap();
+        assert_eq!("03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77", deterministic_public_key.to_hex());
+    }
+
+    #[test]
+    fn test_private_keystore() {
+        let mut keystore = Keystore::from_private_key(
+            TEST_PRIVATE_KEY,
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+
+        assert!(keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .is_ok());
+
+        assert!(!keystore.derivable());
+        assert!(!keystore.is_locked());
+        assert_ne!(keystore.identity().ipfs_id, "");
+        assert!(keystore.identity().identifier.starts_with("im"));
+        assert_eq!(keystore.meta().name, "Unknown");
+        assert_ne!(keystore.id(), "");
+
+        assert_eq!(
+            format!("{}", keystore.export().unwrap()),
+            TEST_PRIVATE_KEY.to_string()
+        );
+        let derived_key = keystore.get_derived_key(TEST_PASSWORD).unwrap();
+        assert!(keystore.verify_password(&Key::Password(TEST_PASSWORD.to_string())));
+        assert!(keystore.verify_password(&Key::DerivedKey(derived_key.to_string())));
+        assert!(!keystore.verify_password(&Key::Password("WRONG PASSWORD".to_string())));
+        assert!(!keystore.verify_password(&Key::DerivedKey("731dd44109f9897eb39980907161b7531be44714352ddaa40542da22fb4fab7533678f2e132226389174faad4e653c542811a7b0c9391ae3cce4e75039a15adc".to_string())));
+
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+
+        let k1_pub_key = Secp256k1PublicKey::from_slice(
+            &Vec::from_hex_auto(
+                "0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe",
+            )
+            .unwrap(),
+        )
+        .unwrap();
+        let public_key = TypedPublicKey::Secp256k1(k1_pub_key);
+
+        let account = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+        assert_eq!(public_key, account.public_key);
+        assert_eq!(account.curve, CurveType::SECP256k1);
+
+        let accounts = keystore.derive_coins::<MockAddress>(&[coin_info]).unwrap();
+        assert_eq!(accounts.len(), 1);
+        assert_eq!(public_key, accounts[0].public_key);
+        assert_eq!(accounts[0].curve, CurveType::SECP256k1);
+
+        let public_key = keystore
+            .get_public_key(CurveType::SECP256k1, "m/44'/0'/0'/0/0")
+            .unwrap();
+        assert_eq!(
+            "0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe",
+            public_key.to_bytes().to_hex()
+        );
+
+        let deterministic_public_key =
+            keystore.get_deterministic_public_key(CurveType::SECP256k1, "m/44'/0'/0'");
+        assert_eq!(
+            deterministic_public_key.err().unwrap().to_string(),
+            Error::CannotDeriveKey.to_string()
+        );
+    }
+
+    #[test]
+    fn test_derive_sub_account() {
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+
+        let typed_pk = TypedDeterministicPublicKey::from_hex(CurveType::SECP256k1, "03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77").unwrap();
+        let account = Keystore::derive_sub_account::<MockAddress>(&typed_pk, &coin_info).unwrap();
+        assert_eq!(
+            "026b5b6a9d041bc5187e0b34f9e496436c7bff261c6c1b5f3c06b433c61394b868",
+            account.address
+        );
+    }
+
+    #[test]
+    fn test_from_invalid_json() {
+        let ret = Keystore::from_json("{}");
+        assert!(ret.is_err());
+
+        let ret = Keystore::from_json(INVALID_PK_KEYSTORE_JSON);
+        assert_eq!(format!("{}", ret.err().unwrap()), "invalid_version")
+    }
+
+    #[test]
+    fn test_source_enum() {
+        let tests = [
+            ("WIF", Source::Wif),
+            ("PRIVATE", Source::Private),
+            ("KEYSTORE_V3", Source::KeystoreV3),
+            ("MNEMONIC", Source::Mnemonic),
+            ("NEW_MNEMONIC", Source::NewMnemonic),
+            ("SUBSTRATE_KEYSTORE", Source::SubstrateKeystore),
+        ];
+
+        for t in tests {
+            assert_eq!(Source::from_str(t.0).unwrap(), t.1);
+            assert_eq!(t.1.to_string(), t.0);
+        }
+
+        assert_eq!(
+            Source::from_str("UNKNOWN").unwrap_err().to_string(),
+            "unknown_source"
+        );
+    }
+
+    #[test]
+    fn test_identity_network_enum() {
+        let tests = [
+            ("MAINNET", IdentityNetwork::Mainnet),
+            ("TESTNET", IdentityNetwork::Testnet),
+        ];
+
+        for t in tests {
+            assert_eq!(IdentityNetwork::from_str(t.0).unwrap(), t.1);
+            assert_eq!(t.1.to_string(), t.0);
+        }
+
+        assert_eq!(
+            IdentityNetwork::from_str("UNKNOWN")
+                .unwrap_err()
+                .to_string(),
+            "unknown_identify_network"
+        );
+    }
+
+    #[test]
+    fn test_transform_mnemonic_error() {
+        let err = transform_mnemonic_error(bip39::ErrorKind::InvalidChecksum.into());
+        assert_eq!(err.to_string(), "mnemonic_checksum_invalid");
+
+        let err = transform_mnemonic_error(bip39::ErrorKind::InvalidWord.into());
+        assert_eq!(err.to_string(), "mnemonic_word_invalid");
+
+        let err = transform_mnemonic_error(bip39::ErrorKind::InvalidWordLength(1).into());
+        assert_eq!(err.to_string(), "mnemonic_length_invalid");
+
+        let err = transform_mnemonic_error(bip39::ErrorKind::InvalidKeysize(1).into());
+        assert_eq!(err.to_string(), "mnemonic_invalid");
+
+        let err = transform_mnemonic_error(anyhow!("test"));
+        assert_eq!(err.to_string(), "mnemonic_invalid");
+    }
+}
diff --git a/token-core/tcx-keystore/src/keystore/private.rs b/token-core/tcx-keystore/src/keystore/private.rs
new file mode 100644
index 00000000..2e2c1933
--- /dev/null
+++ b/token-core/tcx-keystore/src/keystore/private.rs
@@ -0,0 +1,290 @@
+use super::Account;
+use super::{Address, Metadata};
+use anyhow::ensure;
+
+use tcx_constants::{CoinInfo, CurveType};
+use tcx_crypto::{Crypto, Key};
+
+use super::Error;
+use super::Result;
+use crate::identity::Identity;
+use crate::keystore::Store;
+
+use tcx_common::{ripemd160, sha256, FromHex, ToHex};
+use tcx_primitive::{
+    PrivateKey, PublicKey, Secp256k1PrivateKey, Sr25519PrivateKey, TypedPrivateKey,
+};
+use uuid::Uuid;
+
+pub fn fingerprint_from_private_key(data: &[u8]) -> Result<String> {
+    let public_key_data = if data.len() == 32 {
+        let private_key = Secp256k1PrivateKey::from_slice(data)?;
+        private_key.public_key().to_compressed()
+    } else {
+        let private_key = Sr25519PrivateKey::from_slice(data)?;
+        private_key.public_key().to_bytes()
+    };
+    let hashed = ripemd160(&sha256(&public_key_data));
+    Ok(hashed.to_0x_hex())
+}
+
+#[derive(Clone)]
+pub struct PrivateKeystore {
+    store: Store,
+
+    private_key: Option<Vec<u8>>,
+}
+
+impl PrivateKeystore {
+    pub const VERSION: i64 = 12001i64;
+    pub fn store(&self) -> &Store {
+        &self.store
+    }
+
+    pub fn store_mut(&mut self) -> &mut Store {
+        &mut self.store
+    }
+
+    pub fn from_store(store: Store) -> Self {
+        PrivateKeystore {
+            store,
+            private_key: None,
+        }
+    }
+
+    pub(crate) fn unlock(&mut self, key: &Key) -> Result<()> {
+        self.private_key = Some(self.decrypt_private_key(key)?);
+
+        Ok(())
+    }
+
+    pub(crate) fn lock(&mut self) {
+        self.private_key = None;
+    }
+
+    pub(crate) fn is_locked(&self) -> bool {
+        self.private_key.is_none()
+    }
+
+    pub(crate) fn get_private_key(&self, curve: CurveType) -> Result<TypedPrivateKey> {
+        tcx_ensure!(self.private_key.is_some(), Error::KeystoreLocked);
+
+        let private_key = self.private_key.as_ref().unwrap().as_slice();
+
+        TypedPrivateKey::from_slice(curve, private_key)
+    }
+
+    pub(crate) fn derive_coin<A: Address>(&mut self, coin_info: &CoinInfo) -> Result<Account> {
+        tcx_ensure!(self.private_key.is_some(), Error::KeystoreLocked);
+
+        let sk = self.private_key.as_ref().unwrap();
+        ensure!(
+            coin_info.curve == self.store().curve.expect("private keysore need curve"),
+            "private_key_curve_not_match"
+        );
+
+        let account = Self::private_key_to_account::<A>(coin_info, sk)?;
+
+        Ok(account)
+    }
+
+    pub(crate) fn verify_password(&self, key: &Key) -> bool {
+        match key {
+            Key::Password(password) => {
+                return self.store.crypto.verify_password(password);
+            }
+            Key::DerivedKey(derived_key_hex) => {
+                let Ok(derived_key) = Vec::from_hex_auto(derived_key_hex) else {
+                    return false;
+                };
+                return self.store.crypto.verify_derived_key(&derived_key);
+            }
+        }
+    }
+
+    pub fn from_private_key(
+        private_key: &str,
+        password: &str,
+        curve: CurveType,
+        meta: Metadata,
+        original: Option<String>,
+    ) -> Result<PrivateKeystore> {
+        let key_data: Vec<u8> = Vec::from_hex_auto(private_key)?;
+        let fingerprint = fingerprint_from_private_key(&key_data)?;
+        let crypto: Crypto = Crypto::new(password, &key_data);
+        let unlocker = crypto.use_key(&Key::Password(password.to_string()))?;
+        let identity = Identity::from_private_key(private_key, &unlocker, &meta.network)?;
+
+        let ori = if original.is_some() {
+            original.unwrap()
+        } else {
+            private_key.to_string()
+        };
+        let enc_original = unlocker.encrypt_with_random_iv(ori.as_bytes())?;
+
+        let store = Store {
+            source_fingerprint: fingerprint,
+            crypto,
+            meta,
+            id: Uuid::new_v4().as_hyphenated().to_string(),
+            version: PrivateKeystore::VERSION,
+            identity,
+            curve: Some(curve),
+            enc_original: enc_original,
+        };
+
+        Ok(PrivateKeystore {
+            store,
+            private_key: None,
+        })
+    }
+
+    pub(crate) fn private_key_to_account<A: Address>(
+        coin: &CoinInfo,
+        private_key: &[u8],
+    ) -> Result<Account> {
+        let tsk = TypedPrivateKey::from_slice(coin.curve, private_key)?;
+        let pub_key = tsk.public_key();
+        let address = A::from_public_key(&pub_key, coin)?;
+
+        let acc = Account {
+            address: address.to_string(),
+            derivation_path: "".to_string(),
+            curve: coin.curve,
+            coin: coin.coin.to_owned(),
+            network: coin.network.to_string(),
+            seg_wit: coin.seg_wit.to_string(),
+            ext_pub_key: "".to_string(),
+            public_key: pub_key,
+        };
+
+        Ok(acc)
+    }
+
+    fn decrypt_private_key(&self, key: &Key) -> Result<Vec<u8>> {
+        self.store.crypto.use_key(key)?.plaintext()
+    }
+
+    pub(crate) fn private_key(&self) -> Result<String> {
+        tcx_ensure!(self.private_key.is_some(), Error::KeystoreLocked);
+        let vec = self.private_key.as_ref().unwrap().to_vec();
+        Ok(vec.to_hex())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::keystore::private::fingerprint_from_private_key;
+    use crate::keystore::tests::MockAddress;
+    use crate::{Keystore, Metadata, PrivateKeystore, Source};
+    use tcx_common::FromHex;
+    use tcx_constants::{CoinInfo, CurveType, TEST_PASSWORD, TEST_PRIVATE_KEY};
+    use tcx_crypto::Key;
+    use tcx_primitive::{PublicKey, Secp256k1PublicKey, TypedPublicKey};
+
+    #[test]
+    fn test_from_private_key() {
+        let meta = Metadata {
+            name: "from_private_key_test".to_string(),
+            source: Source::Private,
+            ..Metadata::default()
+        };
+        let mut keystore = PrivateKeystore::from_private_key(
+            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            meta,
+            None,
+        )
+        .unwrap();
+
+        keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        assert_eq!(keystore.store.version, 12001);
+        assert_ne!(keystore.store.id, "");
+        assert_eq!(
+            keystore.private_key().unwrap(),
+            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6"
+        );
+    }
+
+    #[test]
+    fn test_verify_password() {
+        let keystore = PrivateKeystore::from_private_key(
+            TEST_PRIVATE_KEY,
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+
+        let derived_key = Keystore::PrivateKey(keystore.clone())
+            .get_derived_key(TEST_PASSWORD)
+            .unwrap();
+        assert!(keystore.verify_password(&Key::Password(TEST_PASSWORD.to_string())));
+        assert!(keystore.verify_password(&Key::DerivedKey(derived_key.to_string())));
+        assert!(!keystore.verify_password(&Key::Password("WRONG PASSWORD".to_string())));
+        assert!(!keystore.verify_password(&Key::DerivedKey("731dd44109f9897eb39980907161b7531be44714352ddaa40542da22fb4fab7533678f2e132226389174faad4e653c542811a7b0c9391ae3cce4e75039a15adc".to_string())));
+    }
+
+    #[test]
+    fn test_fingerprint_from_private_key() {
+        let pk_data = &Vec::<u8>::from_hex(
+            "ad87a08796efbdd9276e2ca5a10f938937cb5d2b7d5f698c06a94d8eeed3f6ae",
+        )
+        .unwrap();
+        let fingerprint = fingerprint_from_private_key(&pk_data).unwrap();
+        assert_eq!(fingerprint, "0x1468dba9c246fe22183c056540ab4d8b04553217");
+
+        let pk_data = &Vec::<u8>::from_hex(
+            "257cd2f8eb13f6930ecb95ac7736dd25e65d231ce1a3b1669e51f6737350b43e",
+        )
+        .unwrap();
+        let fingerprint = fingerprint_from_private_key(&pk_data).unwrap();
+        assert_eq!(fingerprint, "0xf6f232595e79dd9723aa4e840d548e792d44aea6");
+
+        let pk_data = &Vec::<u8>::from_hex(
+            "ad87a08796efbdd9276e2ca5a10f938937cb5d2b7d5f698c06a94d8eeed3f600257cd2f8eb13f6930ecb95ac7736dd25e65d231ce1a3b1669e51f6737350b43e",
+        )
+            .unwrap();
+        let fingerprint = fingerprint_from_private_key(&pk_data).unwrap();
+        assert_eq!(fingerprint, "0x404ba38b37b9c682526621118094a43220a95bd6");
+    }
+
+    #[test]
+    fn test_derive_coin() {
+        let mut keystore = PrivateKeystore::from_private_key(
+            TEST_PRIVATE_KEY,
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        keystore
+            .unlock(&Key::Password(TEST_PASSWORD.to_owned()))
+            .unwrap();
+
+        let coin_infos = [CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        }];
+
+        let excepts = ["0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe"];
+
+        for (i, coin_info) in coin_infos.iter().enumerate() {
+            let acc = keystore.derive_coin::<MockAddress>(&coin_info).unwrap();
+
+            let k1_pub_key =
+                Secp256k1PublicKey::from_slice(&Vec::from_hex_auto(excepts[i]).unwrap()).unwrap();
+            let public_key = TypedPublicKey::Secp256k1(k1_pub_key);
+            assert_eq!(acc.public_key, public_key);
+        }
+    }
+}
diff --git a/token-core/tcx-keystore/src/lib.rs b/token-core/tcx-keystore/src/lib.rs
new file mode 100644
index 00000000..2dde1b18
--- /dev/null
+++ b/token-core/tcx-keystore/src/lib.rs
@@ -0,0 +1,60 @@
+//! TokenCore Chain
+//! This is an abstract package to define basic chain data structures.
+#![feature(test)]
+#[cfg_attr(tarpaulin, ignore)]
+#[macro_use]
+mod macros {
+    #[macro_export]
+    macro_rules! tcx_ensure {
+        ($cond:expr, $e:expr) => {
+            if !($cond) {
+                return Err($e.into());
+            }
+        };
+    }
+}
+
+use core::result;
+
+extern crate regex;
+
+pub mod identity;
+pub mod keystore;
+mod signer;
+
+pub use keystore::{
+    fingerprint_from_mnemonic, fingerprint_from_private_key, fingerprint_from_seed,
+    mnemonic_to_seed, Account, Address, HdKeystore, Keystore, KeystoreGuard, Metadata,
+    PrivateKeystore, PublicKeyEncoder, Source,
+};
+
+pub use signer::{MessageSigner, SignatureParameters, Signer, TransactionSigner};
+
+use thiserror::Error;
+
+pub type Result<T> = result::Result<T, anyhow::Error>;
+
+#[derive(Error, Debug, PartialOrd, PartialEq)]
+pub enum Error {
+    #[error("network_params_invalid")]
+    NetworkParamsInvalid,
+    #[error("unsupported_chain")]
+    WalletInvalidType,
+    #[error("wallet_not_found")]
+    WalletNotFound,
+    #[error("keystore_file_not_exist")]
+    KeystoreFileNotExist,
+    #[error("password_incorrect")]
+    WalletInvalidPassword,
+    #[error("invalid_mnemonic")]
+    InvalidMnemonic,
+    #[error("unsupport_encryption_data_version")]
+    UnsupportEncryptionDataVersion,
+    #[error("invalid_encryption_data_signature")]
+    InvalidEncryptionDataSignature,
+    #[error("invalid_encryption_data")]
+    InvalidEncryptionData,
+}
+
+#[cfg(test)]
+extern crate test;
diff --git a/token-core/tcx-keystore/src/signer.rs b/token-core/tcx-keystore/src/signer.rs
new file mode 100644
index 00000000..49e925ca
--- /dev/null
+++ b/token-core/tcx-keystore/src/signer.rs
@@ -0,0 +1,62 @@
+use crate::Result;
+use tcx_constants::CurveType;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct SignatureParameters {
+    pub curve: CurveType,
+    pub derivation_path: String,
+    pub chain_type: String,
+    pub network: String,
+    pub seg_wit: String,
+}
+
+impl Default for SignatureParameters {
+    fn default() -> Self {
+        SignatureParameters {
+            curve: CurveType::SECP256k1,
+            derivation_path: "".to_string(),
+            chain_type: "".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        }
+    }
+}
+
+pub trait TransactionSigner<Input, Output> {
+    fn sign_transaction(&mut self, params: &SignatureParameters, tx: &Input) -> Result<Output>;
+}
+
+//pub trait Message: Sized {}
+//pub trait SignedMessage: Sized {}
+pub trait MessageSigner<Input, Output> {
+    fn sign_message(&mut self, params: &SignatureParameters, message: &Input) -> Result<Output>;
+}
+
+pub trait Signer {
+    fn sign_hash(
+        &mut self,
+        hash: &[u8],
+        derivation_path: &str,
+        curve: &str,
+        sig_alg: &str,
+    ) -> Result<Vec<u8>>;
+
+    fn secp256k1_ecdsa_sign_recoverable(
+        &mut self,
+        hash: &[u8],
+        derivation_path: &str,
+    ) -> Result<Vec<u8>>;
+
+    fn secp256k1_ecdsa_sign_recoverable_with_noncedata(
+        &mut self,
+        hash: &[u8],
+        derivation_path: &str,
+        noncedata: &[u8; 32],
+    ) -> Result<Vec<u8>>;
+
+    fn bls_sign(&mut self, hash: &[u8], derivation_path: &str, dst: &str) -> Result<Vec<u8>>;
+
+    fn sr25519_sign(&mut self, hash: &[u8], derivation_path: &str) -> Result<Vec<u8>>;
+
+    fn ed25519_sign(&mut self, hash: &[u8], derivation_path: &str) -> Result<Vec<u8>>;
+}
diff --git a/token-core/tcx-libs/ed25519-dalek-bip32/.gitignore b/token-core/tcx-libs/ed25519-dalek-bip32/.gitignore
new file mode 100644
index 00000000..96ef6c0b
--- /dev/null
+++ b/token-core/tcx-libs/ed25519-dalek-bip32/.gitignore
@@ -0,0 +1,2 @@
+/target
+Cargo.lock
diff --git a/token-core/tcx-libs/ed25519-dalek-bip32/Cargo.toml b/token-core/tcx-libs/ed25519-dalek-bip32/Cargo.toml
new file mode 100644
index 00000000..1f0f1ec6
--- /dev/null
+++ b/token-core/tcx-libs/ed25519-dalek-bip32/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "ed25519-dalek-bip32"
+version = "0.3.0"
+authors = ["Julian Popescu <jpopesculian@gmail.com>"]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+readme = "README.md"
+homepage = "https://github.com/jpopesculian/ed25519-dalek-bip32"
+documentation = "https://docs.rs/ed25519-dalek-bip32/"
+repository = "https://github.com/jpopesculian/ed25519-dalek-bip32"
+description = "Simplified ed25519 BIP32 derivations"
+keywords = ["derivation", "BIP32", "ed25519", "trezor", "blockchain"]
+categories = ["cryptography", "no-std"]
+
+[features]
+default = ["std"]
+std = ["derivation-path/std", "sha2/std", "ed25519-dalek/std"]
+
+[dependencies]
+derivation-path = { version = "0.2.0", default-features = false }
+sha2 = { version = "0.10.1", default-features = false }
+hmac = { version = "0.12.0", default-features = false }
+ed25519-dalek = { version = "2.1.0", default-features = false, features = ["rand_core"] }
+
+[dev-dependencies]
+hex = "0.4.2"
diff --git a/token-core/tcx-libs/ed25519-dalek-bip32/README.md b/token-core/tcx-libs/ed25519-dalek-bip32/README.md
new file mode 100644
index 00000000..411d2271
--- /dev/null
+++ b/token-core/tcx-libs/ed25519-dalek-bip32/README.md
@@ -0,0 +1,9 @@
+# ed25519-dalek-bip32
+
+A simple BIP32 implementation for ed25519 public keys. Although there exists [another very good
+library that does this](https://docs.rs/ed25519-bip32), this library preserves 32 byte secret
+keys and doesn't allow for extended public keys or "normal" child indexes, so that it can be as
+close to the BIP32 specifications as possible, allowing for compatibility with libraries like
+`trezor-crypto`
+
+License: MIT OR Apache-2.0
diff --git a/token-core/tcx-libs/ed25519-dalek-bip32/src/lib.rs b/token-core/tcx-libs/ed25519-dalek-bip32/src/lib.rs
new file mode 100644
index 00000000..d0912e52
--- /dev/null
+++ b/token-core/tcx-libs/ed25519-dalek-bip32/src/lib.rs
@@ -0,0 +1,452 @@
+//! A simple BIP32 implementation for ed25519 public keys. Although there exists [another very good
+//! library that does this](https://docs.rs/ed25519-bip32), this library preserves 32 byte secret
+//! keys and doesn't allow for extended public keys or "normal" child indexes, so that it can be as
+//! close to the BIP32 specifications as possible, allowing for compatibility with libraries like
+//! `trezor-crypto`
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub extern crate derivation_path;
+pub extern crate ed25519_dalek;
+
+pub use derivation_path::{ChildIndex, DerivationPath};
+pub use ed25519_dalek::{SigningKey, VerifyingKey};
+
+use core::fmt;
+use hmac::{Hmac, Mac};
+use sha2::Sha512;
+
+const ED25519_BIP32_NAME: &str = "ed25519 seed";
+
+/// Errors thrown while deriving secret keys
+#[derive(Debug)]
+pub enum Error {
+    Ed25519,
+    ExpectedHardenedIndex(ChildIndex),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Ed25519 => f.write_str("ed25519 error"),
+            Self::ExpectedHardenedIndex(index) => {
+                f.write_fmt(format_args!("expected hardened child index: {}", index))
+            }
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for Error {}
+
+/// An expanded secret key with chain code and meta data
+#[derive(Debug, Clone)]
+pub struct ExtendedSigningKey {
+    /// How many derivations this key is from the root (0 for root)
+    pub depth: u8,
+    /// Child index of the key used to derive from parent (`Normal(0)` for root)
+    pub child_index: ChildIndex,
+    /// Signing Key
+    pub signing_key: SigningKey,
+    /// Chain code
+    pub chain_code: [u8; 32],
+}
+
+type HmacSha512 = Hmac<Sha512>;
+
+/// A convenience wrapper for a [`core::result::Result`] with an [`Error`]
+pub type Result<T, E = Error> = core::result::Result<T, E>;
+
+impl ExtendedSigningKey {
+    /// Create a new extended secret key from a seed
+    pub fn from_seed(seed: &[u8]) -> Result<Self> {
+        let mut mac = HmacSha512::new_from_slice(ED25519_BIP32_NAME.as_ref()).unwrap();
+        mac.update(seed);
+        let bytes = mac.finalize().into_bytes();
+
+        let secret_key_bytes: [u8; 32] = bytes[0..32].try_into().unwrap();
+        let signing_key = SigningKey::from_bytes(&secret_key_bytes);
+
+        let mut chain_code = [0; 32];
+        chain_code.copy_from_slice(&bytes[32..]);
+
+        Ok(Self {
+            depth: 0,
+            child_index: ChildIndex::Normal(0),
+            signing_key,
+            chain_code,
+        })
+    }
+
+    /// Derive an extended secret key fom the current using a derivation path
+    pub fn derive<P: AsRef<[ChildIndex]>>(&self, path: &P) -> Result<Self> {
+        let mut path = path.as_ref().iter();
+        let mut next = match path.next() {
+            Some(index) => self.derive_child(*index)?,
+            None => self.clone(),
+        };
+        for index in path {
+            next = next.derive_child(*index)?;
+        }
+        Ok(next)
+    }
+
+    /// Derive a child extended secret key with an index
+    pub fn derive_child(&self, index: ChildIndex) -> Result<Self> {
+        if index.is_normal() {
+            return Err(Error::ExpectedHardenedIndex(index));
+        }
+
+        let mut mac = HmacSha512::new_from_slice(&self.chain_code).unwrap();
+        mac.update(&[0u8]);
+        mac.update(self.signing_key.to_bytes().as_ref());
+        mac.update(index.to_bits().to_be_bytes().as_ref());
+        let bytes = mac.finalize().into_bytes();
+
+        let secret_key_bytes: [u8; 32] = bytes[0..32].try_into().unwrap();
+        let signing_key = SigningKey::from_bytes(&secret_key_bytes);
+
+        let mut chain_code = [0; 32];
+        chain_code.copy_from_slice(&bytes[32..]);
+
+        Ok(Self {
+            depth: self.depth + 1,
+            child_index: index,
+            signing_key,
+            chain_code,
+        })
+    }
+
+    /// Get the associated verifying key
+    #[inline]
+    pub fn verifying_key(&self) -> VerifyingKey {
+        self.signing_key.verifying_key()
+    }
+
+    #[inline]
+    fn clone(&self) -> Self {
+        Self {
+            depth: self.depth,
+            child_index: self.child_index,
+            signing_key: SigningKey::from_bytes(&self.signing_key.to_bytes()),
+            chain_code: self.chain_code,
+        }
+    }
+}
+
+impl From<ed25519_dalek::SignatureError> for Error {
+    fn from(_: ed25519_dalek::SignatureError) -> Self {
+        Self::Ed25519
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    extern crate alloc;
+    use alloc::vec::Vec;
+    use hex::FromHex;
+
+    fn hex_str(string: &str) -> Vec<u8> {
+        hex::decode(string).unwrap()
+    }
+
+    fn key_hex_str(input_str: &str) -> [u8; 32] {
+        <[u8; 32]>::from_hex(input_str).expect("Failed to convert Hex Str into Key")
+    }
+
+    fn root(seed: &str) -> ExtendedSigningKey {
+        ExtendedSigningKey::from_seed(&hex_str(seed)).unwrap()
+    }
+
+    #[test]
+    fn derivation_path() {
+        let vector1_path: DerivationPath = "m/0'/1'/2'/2'/1000000000'".parse().unwrap();
+        let vector2_path: DerivationPath = "m/0'/2147483647'/1'/2147483646'/2'".parse().unwrap();
+
+        let node = root("000102030405060708090a0b0c0d0e0f")
+            .derive(&vector1_path)
+            .unwrap();
+        assert_eq!(node.depth, 5);
+        assert_eq!(node.child_index, ChildIndex::Hardened(1000000000));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("68789923a0cac2cd5a29172a475fe9e0fb14cd6adb5ad98a3fa70333e7afa230")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "8f94d394a8e8fd6b1bc2f3f49f5c47e385281d5c17e65324b0f62483e37e8793",
+        ));
+
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "3c24da049451555d51a7014a37337aa4e12d41e485abccfa46b47dfb2af54b7a",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        let node = root("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542").derive(&vector2_path).unwrap();
+        assert_eq!(node.depth, 5);
+        assert_eq!(node.child_index, ChildIndex::Hardened(2));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("5d70af781f3a37b829f0d060924d5e960bdc02e85423494afc0b1a41bbe196d4")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "551d333177df541ad876a60ea71f00447931c0a9da16f227c11ea080d7391b8d",
+        ));
+
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "47150c75db263559a70d5778bf36abbab30fb061ad69f69ece61a72b0cfa4fc0",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+    }
+
+    #[test]
+    fn normal_errs() {
+        let node = root("000102030405060708090a0b0c0d0e0f");
+
+        let res = node.derive_child(ChildIndex::Normal(0));
+        assert!(matches!(
+            res,
+            Err(Error::ExpectedHardenedIndex(ChildIndex::Normal(0)))
+        ));
+
+        let res = node.derive_child(ChildIndex::Normal(100000));
+        assert!(matches!(
+            res,
+            Err(Error::ExpectedHardenedIndex(ChildIndex::Normal(100000)))
+        ));
+
+        let soft_path: DerivationPath = "m/0'/1'/2'/3/4'".parse().unwrap();
+        let res = node.derive(&soft_path);
+        assert!(matches!(
+            res,
+            Err(Error::ExpectedHardenedIndex(ChildIndex::Normal(3)))
+        ));
+    }
+
+    #[test]
+    fn vector1() {
+        // Chain m
+        let node = root("000102030405060708090a0b0c0d0e0f");
+        assert_eq!(node.depth, 0);
+        assert_eq!(node.child_index, ChildIndex::Normal(0));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("90046a93de5380a72b5e45010748567d5ea02bbf6522f979e05c0d8d8ca9fffb")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "2b4be7f19ee27bbf30c667b642d5f4aa69fd169872f8fc3059c08ebae2eb19e7",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "a4b2856bfec510abab89753fac1ac0e1112364e7d250545963f135f2a33188ed",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'
+        let node = node.derive_child(ChildIndex::Hardened(0)).unwrap();
+        assert_eq!(node.depth, 1);
+        assert_eq!(node.child_index, ChildIndex::Hardened(0));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("8b59aa11380b624e81507a27fedda59fea6d0b779a778918a2fd3590e16e9c69")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "68e0fe46dfb67e368c75379acec591dad19df3cde26e63b93a8e704f1dade7a3",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "8c8a13df77a28f3445213a0f432fde644acaa215fc72dcdf300d5efaa85d350c",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/1'
+        let node = node.derive_child(ChildIndex::Hardened(1)).unwrap();
+        assert_eq!(node.depth, 2);
+        assert_eq!(node.child_index, ChildIndex::Hardened(1));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("a320425f77d1b5c2505a6b1b27382b37368ee640e3557c315416801243552f14")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "b1d0bad404bf35da785a64ca1ac54b2617211d2777696fbffaf208f746ae84f2",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "1932a5270f335bed617d5b935c80aedb1a35bd9fc1e31acafd5372c30f5c1187",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/1'/2'
+        let node = node.derive_child(ChildIndex::Hardened(2)).unwrap();
+        assert_eq!(node.depth, 3);
+        assert_eq!(node.child_index, ChildIndex::Hardened(2));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("2e69929e00b5ab250f49c3fb1c12f252de4fed2c1db88387094a0f8c4c9ccd6c")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "92a5b23c0b8a99e37d07df3fb9966917f5d06e02ddbd909c7e184371463e9fc9",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "ae98736566d30ed0e9d2f4486a64bc95740d89c7db33f52121f8ea8f76ff0fc1",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/1'/2'/2'
+        let node = node.derive_child(ChildIndex::Hardened(2)).unwrap();
+        assert_eq!(node.depth, 4);
+        assert_eq!(node.child_index, ChildIndex::Hardened(2));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("8f6d87f93d750e0efccda017d662a1b31a266e4a6f5993b15f5c1f07f74dd5cc")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "30d1dc7e5fc04c31219ab25a27ae00b50f6fd66622f6e9c913253d6511d1e662",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "8abae2d66361c879b900d204ad2cc4984fa2aa344dd7ddc46007329ac76c429c",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/1'/2'/2'/1000000000'
+        let node = node.derive_child(ChildIndex::Hardened(1000000000)).unwrap();
+        assert_eq!(node.depth, 5);
+        assert_eq!(node.child_index, ChildIndex::Hardened(1000000000));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("68789923a0cac2cd5a29172a475fe9e0fb14cd6adb5ad98a3fa70333e7afa230")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "8f94d394a8e8fd6b1bc2f3f49f5c47e385281d5c17e65324b0f62483e37e8793",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "3c24da049451555d51a7014a37337aa4e12d41e485abccfa46b47dfb2af54b7a",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+    }
+
+    #[test]
+    fn vector2() {
+        // Chain m
+        let node = root("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542");
+        assert_eq!(node.depth, 0);
+        assert_eq!(node.child_index, ChildIndex::Normal(0));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("ef70a74db9c3a5af931b5fe73ed8e1a53464133654fd55e7a66f8570b8e33c3b")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "171cb88b1b3c1db25add599712e36245d75bc65a1a5c9e18d76f9f2b1eab4012",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "8fe9693f8fa62a4305a140b9764c5ee01e455963744fe18204b4fb948249308a",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'
+        let node = node.derive_child(ChildIndex::Hardened(0)).unwrap();
+        assert_eq!(node.depth, 1);
+        assert_eq!(node.child_index, ChildIndex::Hardened(0));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("0b78a3226f915c082bf118f83618a618ab6dec793752624cbeb622acb562862d")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "1559eb2bbec5790b0c65d8693e4d0875b1747f4970ae8b650486ed7470845635",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "86fab68dcb57aa196c77c5f264f215a112c22a912c10d123b0d03c3c28ef1037",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/2147483647'
+        let node = node.derive_child(ChildIndex::Hardened(2147483647)).unwrap();
+        assert_eq!(node.depth, 2);
+        assert_eq!(node.child_index, ChildIndex::Hardened(2147483647));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("138f0b2551bcafeca6ff2aa88ba8ed0ed8de070841f0c4ef0165df8181eaad7f")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "ea4f5bfe8694d8bb74b7b59404632fd5968b774ed545e810de9c32a4fb4192f4",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "5ba3b9ac6e90e83effcd25ac4e58a1365a9e35a3d3ae5eb07b9e4d90bcf7506d",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/2147483647'/1'
+        let node = node.derive_child(ChildIndex::Hardened(1)).unwrap();
+        assert_eq!(node.depth, 3);
+        assert_eq!(node.child_index, ChildIndex::Hardened(1));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("73bd9fff1cfbde33a1b846c27085f711c0fe2d66fd32e139d3ebc28e5a4a6b90")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "3757c7577170179c7868353ada796c839135b3d30554bbb74a4b1e4a5a58505c",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "2e66aa57069c86cc18249aecf5cb5a9cebbfd6fadeab056254763874a9352b45",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/2147483647'/1'/2147483646'
+        let node = node.derive_child(ChildIndex::Hardened(2147483646)).unwrap();
+        assert_eq!(node.depth, 4);
+        assert_eq!(node.child_index, ChildIndex::Hardened(2147483646));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("0902fe8a29f9140480a00ef244bd183e8a13288e4412d8389d140aac1794825a")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "5837736c89570de861ebc173b1086da4f505d4adb387c6a1b1342d5e4ac9ec72",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "e33c0f7d81d843c572275f287498e8d408654fdf0d1e065b84e2e6f157aab09b",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+
+        // Chain m/0'/2147483647'/1'/2147483646'/2'
+        let node = node.derive_child(ChildIndex::Hardened(2)).unwrap();
+        assert_eq!(node.depth, 5);
+        assert_eq!(node.child_index, ChildIndex::Hardened(2));
+        assert_eq!(
+            node.chain_code.as_ref(),
+            hex_str("5d70af781f3a37b829f0d060924d5e960bdc02e85423494afc0b1a41bbe196d4")
+        );
+        let secret = SigningKey::from_bytes(&key_hex_str(
+            "551d333177df541ad876a60ea71f00447931c0a9da16f227c11ea080d7391b8d",
+        ));
+        assert_eq!(node.signing_key.to_bytes(), secret.to_bytes());
+        let public = VerifyingKey::from_bytes(&key_hex_str(
+            "47150c75db263559a70d5778bf36abbab30fb061ad69f69ece61a72b0cfa4fc0",
+        ))
+        .unwrap();
+        assert_eq!(node.verifying_key().to_bytes(), public.to_bytes());
+    }
+}
diff --git a/token-core/tcx-libs/secp256k1/Cargo.toml b/token-core/tcx-libs/secp256k1/Cargo.toml
index c72cdf90..f03309ac 100644
--- a/token-core/tcx-libs/secp256k1/Cargo.toml
+++ b/token-core/tcx-libs/secp256k1/Cargo.toml
@@ -36,7 +36,7 @@ endomorphism = []
 lowmemory = []
 
 [dev-dependencies]
-rand = "0.8.5"
+rand = "=0.8.5"
 rand_core = "0.6.4"
 serde_test = "1.0"
 
diff --git a/token-core/tcx-migration/Cargo.toml b/token-core/tcx-migration/Cargo.toml
new file mode 100644
index 00000000..4b760f51
--- /dev/null
+++ b/token-core/tcx-migration/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "tcx-migration"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[features]
+integration-tests = []
+
+
+[dependencies]
+tcx-proto = { path = "../tcx-proto" }
+tcx-crypto = { path = "../tcx-crypto", features = ["cache_dk"] }
+tcx-keystore = { path = "../tcx-keystore", features = ["cache_dk"] }
+tcx-atom = { path = "../tcx-atom" }
+tcx-eos = { path = "../tcx-eos" }
+tcx-btc-kin = { path = "../tcx-btc-kin" }
+tcx-primitive = { path = "../tcx-primitive" }
+tcx-constants = { path = "../tcx-constants" }
+tcx-tezos = { path = "../tcx-tezos" }
+tcx-tron = { path = "../tcx-tron" }
+tcx-substrate = { path = "../tcx-substrate" }
+tcx-filecoin = { path = "../tcx-filecoin" }
+# tcx-eth2 = { path = "../tcx-eth2" }
+tcx-eth = { path = "../tcx-eth" }
+tcx-common = { path = "../tcx-common" }
+
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
+
+libc = "=0.2.140"
+log = "=0.4.17"
+serde_json = "=1.0.89"
+serde = { version = "=1.0.147", features = ["derive"] }
+anyhow = { version = "=1.0.79", features = [] }
+lazy_static = "=1.4.0"
+hex = "=0.4.3"
+base64 = "=0.13.1"
+base58 = "=0.2.0"
+parking_lot = "=0.12.1"
+uuid = { version = "=1.2.2", features = ["serde", "v4"] }
diff --git a/token-core/tcx-migration/src/keystore_upgrade.rs b/token-core/tcx-migration/src/keystore_upgrade.rs
new file mode 100644
index 00000000..3bf38342
--- /dev/null
+++ b/token-core/tcx-migration/src/keystore_upgrade.rs
@@ -0,0 +1,742 @@
+use anyhow::anyhow;
+use serde_json::{json, Value};
+use tcx_btc_kin::WIFDisplay;
+use tcx_common::ToHex;
+use tcx_constants::{coin_info_from_param, CurveType};
+use tcx_crypto::{Crypto, Key};
+use tcx_filecoin::KeyInfo;
+use tcx_keystore::identity::Identity;
+use tcx_keystore::keystore::IdentityNetwork;
+use tcx_keystore::{
+    fingerprint_from_mnemonic, fingerprint_from_private_key, fingerprint_from_seed,
+    mnemonic_to_seed, HdKeystore, Keystore, PrivateKeystore, Result, Source,
+};
+use tcx_primitive::TypedPrivateKey;
+use tcx_substrate::encode_substrate_keystore;
+use tcx_tezos::encode_tezos_private_key;
+
+pub fn mapping_curve_name(old_curve_name: &str) -> String {
+    let new_curve_name = match old_curve_name {
+        "ED25519" => CurveType::ED25519,
+        "SECP256k1" => CurveType::SECP256k1,
+        "ED25519Blake2bNano" => CurveType::ED25519Blake2bNano,
+        "SubSr25519" => CurveType::SR25519,
+        "BLS" => CurveType::BLS,
+        _ => panic!("unsupported_curve_name"),
+    };
+    new_curve_name.as_str().to_string()
+}
+
+pub struct KeystoreUpgrade {
+    json: Value,
+}
+
+impl KeystoreUpgrade {
+    pub fn new(json: Value) -> Self {
+        KeystoreUpgrade { json }
+    }
+
+    pub fn need_upgrade(&self) -> bool {
+        let version = self.json["version"].as_i64().unwrap_or(0);
+        (version == 11000 || version == 11001)
+            && self.json["crypto"].is_object()
+            && self.json["imTokenMeta"].is_object()
+    }
+
+    pub fn upgrade(&self, key: &Key, identity_network: &IdentityNetwork) -> Result<Keystore> {
+        let version = self.json["version"].as_i64().unwrap_or(0);
+
+        let mut json = self.json.clone();
+
+        let source: &str = json["imTokenMeta"]["source"].as_str().unwrap_or("");
+        json["imTokenMeta"]["source"] = match (version, source) {
+            (11000, "NEW_IDENTITY") => json!(Source::NewMnemonic.to_string()),
+            (11000, "RECOVERED_IDENTITY") => json!(Source::Mnemonic.to_string()),
+            (11000, _) => json!(Source::Mnemonic.to_string()),
+            (11001, "PRIVATE") => {
+                let accounts = json["activeAccounts"]
+                    .as_array()
+                    .expect("tcx pk keystore accounts");
+                let first_account = accounts.first().expect("first tcx activeAccounts");
+                if first_account["curve"].as_str().expect("account curve") == "SubSr25519" {
+                    json!(Source::SubstrateKeystore.to_string())
+                } else {
+                    json!(Source::Private.to_string())
+                }
+            }
+            (11001, "WIF") => json!(Source::Wif.to_string()),
+            (11001, "KEYSTORE") => json!(Source::KeystoreV3.to_string()),
+            (11001, _) => json!(Source::Private.to_string()),
+            (_, _) => json!(Source::Private),
+        };
+
+        let crypto: Crypto = serde_json::from_value(json["crypto"].clone())?;
+        let unlocker = crypto.use_key(key)?;
+        let fingerprint = match version {
+            11000 => fingerprint_from_mnemonic(&String::from_utf8_lossy(&unlocker.plaintext()?)),
+            11001 => fingerprint_from_private_key(unlocker.plaintext()?.as_slice()),
+            _ => return Err(anyhow!("unknown_version_when_upgrade_keystore")),
+        }?;
+        json["sourceFingerprint"] = json!(fingerprint);
+
+        match version {
+            11001 => {
+                json["version"] = json!(PrivateKeystore::VERSION);
+                let private_key = unlocker.plaintext()?;
+                json["identity"] = json!(Identity::from_private_key(
+                    &private_key.to_hex(),
+                    &unlocker,
+                    &identity_network,
+                )?);
+
+                json["fingerprint"] = json!(fingerprint_from_private_key(&private_key)?);
+                if let Some(account_json) = self.json["activeAccounts"]
+                    .as_array()
+                    .expect("tcx keystore missing accounts")
+                    .first()
+                {
+                    let old_curve_name = account_json["curve"]
+                        .as_str()
+                        .expect("activeAccounts need contains curve");
+                    let new_curve_name = mapping_curve_name(&old_curve_name);
+                    json["curve"] = json!(new_curve_name);
+                    let chain_type = account_json["coin"]
+                        .as_str()
+                        .expect("activeAccounts need contains chainType");
+                    json["imTokenMeta"]["identifiedChainTypes"] = json!(vec![chain_type]);
+                    // tcx pk keystore has lost the original private key
+                    let original = self.restore_private_key_original(
+                        key,
+                        &private_key,
+                        chain_type,
+                        &new_curve_name,
+                        account_json,
+                    )?;
+                    let enc_pair = unlocker.encrypt_with_random_iv(original.as_bytes())?;
+                    json["encOriginal"] = json!(enc_pair);
+                }
+            }
+            11000 => {
+                let mnemonic = String::from_utf8(unlocker.plaintext()?)?;
+                let seed = mnemonic_to_seed(&mnemonic)?;
+
+                json["fingerprint"] = json!(fingerprint_from_seed(&seed)?);
+                json["version"] = json!(HdKeystore::VERSION);
+                json["identity"] =
+                    json!(Identity::from_seed(&seed, &unlocker, &identity_network,)?);
+                let enc_pair = unlocker.encrypt_with_random_iv(mnemonic.as_bytes())?;
+                json["encOriginal"] = json!(enc_pair);
+            }
+            _ => return Err(anyhow!("unknown_version_when_upgrade_keystore")),
+        }
+
+        Keystore::from_json(&json.to_string())
+    }
+
+    fn restore_private_key_original(
+        &self,
+        key: &Key,
+        private_key_bytes: &[u8],
+        chain_type: &str,
+        new_curve_name: &str,
+        account_json: &Value,
+    ) -> Result<String> {
+        match chain_type {
+            "KUSAMA" | "POLKADOT" => {
+                let coin = coin_info_from_param(chain_type, "", "", "")?;
+                let Key::Password(password) = key else {
+                    return Err(anyhow!("substrate_cannot_use_derived_key"));
+                };
+
+                let mut substrate_ks =
+                    encode_substrate_keystore(&password, &private_key_bytes, &coin)?;
+                let name = self.json["imTokenMeta"]["name"]
+                    .as_str()
+                    .unwrap_or_default();
+                let created_at = self.json["imTokenMeta"]["timestamp"]
+                    .as_i64()
+                    .unwrap_or_default();
+                substrate_ks.meta.name = name.to_string();
+                substrate_ks.meta.when_created = created_at;
+                let json = serde_json::to_string(&substrate_ks)?;
+                Ok(json)
+            }
+            "TEZOS" => Ok(encode_tezos_private_key(&private_key_bytes.to_hex())?),
+            "FILECOIN" => {
+                let curve_type = CurveType::from_str(&new_curve_name);
+                Ok(KeyInfo::from_private_key(curve_type, &private_key_bytes)?
+                    .to_json()?
+                    .to_hex())
+            }
+            "BITCOINCASH" | "LITECOIN" => {
+                let network = account_json["network"].as_str().unwrap_or("MAINNET");
+                let seg_wit = account_json["segWit"].as_str().unwrap_or("");
+                let coin_info = coin_info_from_param(&chain_type, network, seg_wit, "secp256k1")?;
+                let typed_pk =
+                    TypedPrivateKey::from_slice(CurveType::SECP256k1, &private_key_bytes)?;
+                typed_pk.fmt(&coin_info)
+            }
+            _ => Ok(private_key_bytes.to_hex()),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{json, Value};
+    use tcx_common::ToHex;
+    use tcx_constants::{CurveType, TEST_PASSWORD};
+    use tcx_crypto::Error::PasswordIncorrect;
+    use tcx_crypto::Key;
+    use tcx_keystore::{keystore::IdentityNetwork, Source};
+
+    use super::KeystoreUpgrade;
+
+    fn pk_json(version: i64, source: &str, name: &str) -> Value {
+        json!(
+            {
+             "id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b",
+             "version":version,
+             "keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+             "crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2",
+                "kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},
+             "activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],
+            "imTokenMeta":{"name":name.to_string(),"passwordHint":"","timestamp":1576733295,"source":source.to_string()}}
+        )
+    }
+
+    fn hd_json(version: i64, source: &str, name: &str) -> Value {
+        json!(
+         { "id":"ae45d424-31d8-49f7-a601-1272b40c566d",
+           "version":version,
+           "keyHash":"512115eca3ae86646aeb06861d551e403b543509",
+           "crypto": {
+           "cipher":"aes-128-ctr",
+           "cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},
+           "ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d",
+           "kdf":"pbkdf2",
+           "kdfparams": { "c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},
+           "mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},
+           "activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"secp256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}],
+           "imTokenMeta":{"name":name.to_string(),"passwordHint":"","timestamp":1576561805,"source": source.to_string() }
+         }
+        )
+    }
+
+    fn hd_derived_key() -> String {
+        "9e6c4391999f0f578105284fe25eb9cf1b60ab75473ac155c83091ae36bf2bb64eb6ec5cbe39dab3a100f87442ee580619700291c15e84961fec2a259c808e68".to_owned()
+    }
+
+    fn private_derived_key() -> String {
+        "f1d0dbb4b6e7ea6ac99b0a59700f8d8e448ef29a721cbc4d0bc307b26887f232e437366ce87f97eb24c22206452daf83025c9c641a4f63000e20bc9bc5d3fb26".to_owned()
+    }
+
+    #[test]
+    fn test_invalid_versions() {
+        let tests = [
+            (-10000000, "MNEMONIC", Source::NewMnemonic),
+            (2000000, "MNEMONIC", Source::Wif),
+        ];
+
+        for t in tests {
+            let upgrade_keystore = super::KeystoreUpgrade::new(hd_json(t.0, t.1, "Unknown"));
+            let key = Key::DerivedKey(hd_derived_key());
+
+            let upgraded = upgrade_keystore.upgrade(&key, &IdentityNetwork::Mainnet);
+
+            assert!(!upgrade_keystore.need_upgrade());
+            assert_eq!(
+                upgraded.err().unwrap().to_string(),
+                "unknown_version_when_upgrade_keystore"
+            );
+        }
+    }
+
+    #[test]
+    fn test_upgrade_with_password() {
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(hd_json(11000, "NEW_IDENTITY", "Unknown"));
+        let key = Key::Password("imtoken1".to_owned());
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+
+        assert!(upgrade_keystore.need_upgrade());
+        assert_eq!(upgraded.store().version, 12000);
+        assert_eq!(upgraded.store().meta.source, Source::NewMnemonic);
+    }
+
+    #[test]
+    fn test_upgrade_with_wrong_derived_key() {
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(hd_json(11000, "NEW_IDENTITY", "Unknown"));
+        let key = Key::DerivedKey("9e6c4391999f0f578105284fe25eb9cf1b60ab75473ac155c83091ae36bf2bb64eb6ec5cbe39dab3a100f87442ee580619700291c15e84961fec2a259c808e69".to_owned());
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+
+        assert!(upgrade_keystore.need_upgrade());
+        assert_eq!(upgraded.store().version, 12000);
+        assert_eq!(upgraded.store().meta.source, Source::NewMnemonic);
+    }
+
+    #[test]
+    fn test_hd_keystore_upgrade() {
+        let tests = [
+            ("NEW_IDENTITY", Source::NewMnemonic),
+            ("RECOVERED_IDENTITY", Source::Mnemonic),
+            ("KEYSTORE", Source::Mnemonic),
+            ("PRIVATE", Source::Mnemonic),
+            ("WIF", Source::Mnemonic),
+            ("OO", Source::Mnemonic),
+        ];
+
+        for t in tests {
+            let upgrade_keystore = super::KeystoreUpgrade::new(hd_json(11000, t.0, "Unknown"));
+            let key = Key::DerivedKey(hd_derived_key());
+
+            let upgraded = upgrade_keystore
+                .upgrade(&key, &IdentityNetwork::Testnet)
+                .unwrap();
+
+            assert!(upgrade_keystore.need_upgrade());
+            assert_eq!(upgraded.store().version, 12000);
+            assert_eq!(upgraded.store().meta.source, t.1);
+        }
+    }
+
+    #[test]
+    fn test_upgrade_hd_identity_network() {
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(hd_json(11000, "NEW_IDENTITY", "Unknown"));
+        let key = Key::DerivedKey(hd_derived_key());
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+
+        assert_eq!(
+            upgraded.identity().identifier,
+            "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg"
+        );
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Mainnet)
+            .unwrap();
+
+        assert_eq!(
+            upgraded.identity().identifier,
+            "im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf"
+        );
+    }
+
+    #[test]
+    fn test_private_keystore_upgrade() {
+        let tests = [
+            ("NEW_IDENTITY", Source::Private),
+            ("RECOVERED_IDENTITY", Source::Private),
+            ("KEYSTORE", Source::KeystoreV3),
+            ("PRIVATE", Source::Private),
+            ("WIF", Source::Wif),
+            ("OO", Source::Private),
+        ];
+
+        for t in tests {
+            let upgrade_keystore = super::KeystoreUpgrade::new(pk_json(11001, t.0, "vvvvvv"));
+            let key = Key::DerivedKey(private_derived_key());
+
+            let upgraded = upgrade_keystore
+                .upgrade(&key, &IdentityNetwork::Testnet)
+                .unwrap();
+
+            assert!(upgrade_keystore.need_upgrade());
+            assert_eq!(upgraded.store().version, 12001);
+            assert_eq!(upgraded.store().meta.source, t.1);
+        }
+    }
+
+    #[test]
+    fn test_upgrade_pk_identity_network() {
+        let upgrade_keystore = super::KeystoreUpgrade::new(pk_json(11001, "WIF", "vvvvvv"));
+        let key = Key::DerivedKey(private_derived_key());
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+
+        assert_eq!(
+            upgraded.identity().identifier,
+            "im18MDUZKTuAALuXb1Wait1XBb984rdjVpFeBgu"
+        );
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Mainnet)
+            .unwrap();
+
+        assert_eq!(
+            upgraded.identity().identifier,
+            "im14x5UPbCXmU2HMQ8jfeKcCDrQYhDppRYaa5C6"
+        );
+    }
+
+    #[test]
+    fn test_invalid_version() {
+        let upgrade_keystore = super::KeystoreUpgrade::new(pk_json(11002, "PRIVATE", "SSS"));
+        let key = Key::DerivedKey(hd_derived_key());
+
+        let upgraded = upgrade_keystore.upgrade(&key, &IdentityNetwork::Testnet);
+        assert!(upgraded.is_err());
+    }
+
+    #[test]
+    fn test_need_upgrade() {
+        let upgrade_keystore = super::KeystoreUpgrade::new(pk_json(11001, "PRIVATE", "中文"));
+        assert!(upgrade_keystore.need_upgrade());
+
+        let upgrade_keystore = super::KeystoreUpgrade::new(hd_json(11000, "MNEMONIC", "æœ"));
+        assert!(upgrade_keystore.need_upgrade());
+    }
+
+    #[test]
+    fn test_not_need_upgrade() {
+        let upgrade_keystore = super::KeystoreUpgrade::new(pk_json(12001, "PRIVATE", "EE"));
+        assert!(!upgrade_keystore.need_upgrade());
+
+        let upgrade_keystore = super::KeystoreUpgrade::new(hd_json(12000, "MNEMONIC", "BB"));
+        assert!(!upgrade_keystore.need_upgrade());
+    }
+
+    #[test]
+    fn test_empty_json() {
+        let upgrade_keystore = super::KeystoreUpgrade::new(json!({}));
+        assert!(!upgrade_keystore.need_upgrade());
+    }
+
+    #[test]
+    fn test_empty_metadata() {
+        let json = json!(
+        { "id":"ae45d424-31d8-49f7-a601-1272b40c566d",
+          "version":11000,
+          "keyHash":"512115eca3ae86646aeb06861d551e403b543509",
+          "crypto": {
+          "cipher":"aes-128-ctr",
+          "cipherparams":{"iv":"588233984e9576f058bd7bae018eaa38"},
+          "ciphertext":"8a5451c57fed478c7d45f5391659a6fb5fc85a347f1f7aaead450ad4ef4fe434d042d57aa990d850165293609aa746c715c805b236c3d54d86e7dea7d938ce55fcb2684e0eb7e0e6cc7d",
+          "kdf":"pbkdf2",
+          "kdfparams": { "c":1024,"prf":"hmac-sha256","dklen":32,"salt":"ee656af962155e4e6e763b0883ed0d8cc37c2fa21a7ef01b1d3b18f352f74c69"},
+          "mac":"a661aa444869aac9ea33f066676c6bfb49d079ab986d0ee755f8a1747b2b7f17"},
+          "activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"secp256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}]
+        });
+
+        let upgrade_keystore = super::KeystoreUpgrade::new(json);
+        assert!(!upgrade_keystore.need_upgrade());
+    }
+
+    #[test]
+    fn test_empty_crypto() {
+        let json = json!(
+        { "id":"ae45d424-31d8-49f7-a601-1272b40c566d",
+          "version":11000,
+          "keyHash":"512115eca3ae86646aeb06861d551e403b543509",
+          "activeAccounts":[{"address":"mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN","derivationPath":"m/44'/1'/0'/0/0","curve":"secp256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020"}]
+        });
+
+        let upgrade_keystore = super::KeystoreUpgrade::new(json);
+        assert!(!upgrade_keystore.need_upgrade());
+    }
+
+    #[test]
+    fn test_wrong_password() {
+        let upgrade_keystore = super::KeystoreUpgrade::new(pk_json(11001, "PRIVATE", "vvvvvv"));
+        let key = Key::Password("imtoken2".to_owned());
+
+        let upgraded = upgrade_keystore.upgrade(&key, &IdentityNetwork::Testnet);
+        assert_eq!(
+            upgraded.err().unwrap().to_string(),
+            PasswordIncorrect.to_string()
+        );
+    }
+
+    fn pk_json_with_bls(version: i64, source: &str, name: &str) -> Value {
+        json!(
+            {
+             "id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b",
+             "version":version,
+             "keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+             "crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2",
+                "kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},
+                "activeAccounts": [{"address": "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa", "curve": "BLS", "coin": "FILECOIN"}],
+            "imTokenMeta":{"name":name.to_string(),"passwordHint":"","timestamp":1576733295,"source":source.to_string()}}
+        )
+    }
+
+    fn pk_json_with_secp256k1(version: i64, source: &str, name: &str) -> Value {
+        json!(
+            {
+             "id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b",
+             "version":version,
+             "keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+             "crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2",
+                "kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},
+                "activeAccounts": [{"address": "", "curve": "SECP256k1", "coin": "BITCOINCASH"}],
+            "imTokenMeta":{"name":name.to_string(),"passwordHint":"","timestamp":1576733295,"source":source.to_string()}}
+        )
+    }
+
+    fn pk_json_with_ed25519(version: i64, source: &str, name: &str) -> Value {
+        json!(
+            {
+             "id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b",
+             "version":version,
+             "keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+             "crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"c0ecc72839f8a02cc37eb7b0dd0b93ba"},"ciphertext":"1239e5807e19f95d86567f81c162c69a5f4564ea17f487669a277334f4dcc7dc","kdf":"pbkdf2",
+                "kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3c9df9eb95a014c77bbc8b9a06f4f14e0d08170dea71189c7cf377a3b2099404"},"mac":"909a6bfe1ad031901e80927b847a8fa8407fdcde56cfa374f7a732fb3b3a882d"},
+                "activeAccounts": [{"address": "", "curve": "ED25519", "coin": "TEZOS"}],
+            "imTokenMeta":{"name":name.to_string(),"passwordHint":"","timestamp":1576733295,"source":source.to_string()}}
+        )
+    }
+
+    fn pk_json_with_subsr25519(version: i64, source: &str, name: &str) -> Value {
+        json!(
+            {
+             "id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b",
+             "version":version,
+             "keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+             "crypto": {
+                "cipher": "aes-128-ctr",
+                "cipherparams": { "iv": "31deaa1033b2a55cc39916b347453649" },
+                "ciphertext": "c52bbc9842da2e9afdf8b905585db5ea4b86920f54f76e5ce686586604a29c3cc152ba9f309d2a1995cddb0ecafbe4d1f43ad033d1e0f5a02e68eda7c2f71687",
+                "kdf": "pbkdf2",
+                "kdfparams": {
+                  "c": 1,
+                  "prf": "hmac-sha256",
+                  "dklen": 32,
+                  "salt": "87436212538c3d747df0988246078a308bed9245388badf88dbeb21806e6dd49"
+                },
+                "mac": "53af7ee52b69782e775a46def178d0b629c94b04e70fbddc5adafa437b6144e6"
+              },
+                "activeAccounts": [{"address": "", "curve": "SubSr25519", "coin": "POLKADOT"}],
+            "imTokenMeta":{"name":name.to_string(),"passwordHint":"","timestamp":1576733295,"source":source.to_string()}}
+        )
+    }
+
+    fn pk_json_without_password_hint(version: i64, source: &str, name: &str) -> Value {
+        json!(
+            {
+             "id":"89e6fc5d-ac9a-46ab-b53f-342a80f3d28b",
+             "version":version,
+             "keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+             "crypto": {
+                "cipher": "aes-128-ctr",
+                "cipherparams": { "iv": "31deaa1033b2a55cc39916b347453649" },
+                "ciphertext": "c52bbc9842da2e9afdf8b905585db5ea4b86920f54f76e5ce686586604a29c3cc152ba9f309d2a1995cddb0ecafbe4d1f43ad033d1e0f5a02e68eda7c2f71687",
+                "kdf": "pbkdf2",
+                "kdfparams": {
+                  "c": 1,
+                  "prf": "hmac-sha256",
+                  "dklen": 32,
+                  "salt": "87436212538c3d747df0988246078a308bed9245388badf88dbeb21806e6dd49"
+                },
+                "mac": "53af7ee52b69782e775a46def178d0b629c94b04e70fbddc5adafa437b6144e6"
+              },
+                "activeAccounts": [{"address": "", "curve": "SubSr25519", "coin": "POLKADOT"}],
+            "imTokenMeta":{"name":name.to_string(),"timestamp":1576733295,"source":source.to_string()}}
+        )
+    }
+
+    #[test]
+    fn test_migration_curve() {
+        let key = Key::Password("imtoken1".to_owned());
+
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(pk_json_with_bls(11001, "PRIVATE", "vvvvvv"));
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+        assert_eq!(upgraded.store().curve, Some(CurveType::BLS));
+
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(pk_json_with_ed25519(11001, "PRIVATE", "vvvvvv"));
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+        assert_eq!(upgraded.store().curve, Some(CurveType::ED25519));
+
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(pk_json_with_subsr25519(11001, "PRIVATE", "vvvvvv"));
+
+        let upgraded = upgrade_keystore
+            .upgrade(
+                &Key::Password(TEST_PASSWORD.to_string()),
+                &IdentityNetwork::Testnet,
+            )
+            .unwrap();
+        assert_eq!(upgraded.store().curve, Some(CurveType::SR25519));
+
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(pk_json_without_password_hint(11001, "PRIVATE", "vvvvvv"));
+
+        let upgraded = upgrade_keystore
+            .upgrade(
+                &Key::Password(TEST_PASSWORD.to_string()),
+                &IdentityNetwork::Testnet,
+            )
+            .unwrap();
+        assert_eq!(upgraded.store().curve, Some(CurveType::SR25519));
+
+        let upgrade_keystore =
+            super::KeystoreUpgrade::new(pk_json_with_secp256k1(11001, "PRIVATE", "vvvvvv"));
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+        assert_eq!(upgraded.store().curve, Some(CurveType::SECP256k1));
+
+        let upgrade_keystore = super::KeystoreUpgrade::new(hd_json(11000, "MNEMONIC", "vvvvvv"));
+
+        let upgraded = upgrade_keystore
+            .upgrade(&key, &IdentityNetwork::Testnet)
+            .unwrap();
+        assert_eq!(upgraded.store().curve, None);
+    }
+
+    #[test]
+    fn test_original_after_migrate_tron() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+        assert_eq!(
+            ori,
+            "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171"
+        );
+
+        let ori = ks.backup(&Key::DerivedKey("1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017".to_string())).unwrap();
+        assert_eq!(
+            ori,
+            "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171"
+        );
+    }
+
+    #[test]
+    fn test_original_after_migrate_tezos() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+        assert_eq!(
+            ori,
+            "edskS3E5CLrkwHRYAbDvw5xC913C9GGseMcyNGeGbeaD57Yvvi2jqizpAAZyzUtRK626UvkKYdJwCYE9oKMcqFCtJeBpDYcrVH"
+        );
+
+        let ori = ks.backup(&Key::DerivedKey("b009d3c4e961411836028a9fffbea994e03c71f75589a571cd52125884537f2ac165b92e7bc49c7828d4be0c5c05263a306744f0b9dc785142c8562d45ce4345".to_string())).unwrap();
+        assert_eq!(
+            ori,
+            "edskS3E5CLrkwHRYAbDvw5xC913C9GGseMcyNGeGbeaD57Yvvi2jqizpAAZyzUtRK626UvkKYdJwCYE9oKMcqFCtJeBpDYcrVH"
+        );
+    }
+
+    #[test]
+    fn test_original_after_migrate_lite() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/46e8e653-dd05-4217-b225-faafc8451a2c.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        assert_eq!(ori, "TBRMznXcDf2HK2jBKJsqjBpsEdaiaZUBGKN8aKdwTMrPnMNB5UQM");
+        let ori = ks.backup(&Key::DerivedKey("2e70651f06a28d2f6053a90ee55ab8cb14518ab82182cd922926b4239713286ac6746ad4448608fc1599e6f4e0af33c65f70bc5de13a376933e5e145681d0f80".to_string())).unwrap();
+
+        assert_eq!(ori, "TBRMznXcDf2HK2jBKJsqjBpsEdaiaZUBGKN8aKdwTMrPnMNB5UQM");
+    }
+
+    #[test]
+    fn test_original_after_migrate_bch() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/483cb13e-5e59-4428-a219-018de4ce60f6.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        assert_eq!(ori, "L1xDTJYPqhofU8DQCiwjStEBr1X6dhiNfweUhxhoRSgYyMJPcZ6B");
+
+        let ori = ks.backup(&Key::DerivedKey("d175dad756f59a59b6a311f2b369802537d92011c8e3bf6dc2dfaf8df00d942648bf83133bd0204ebc43efcbd0ab79a8d5551c8dcf7ae1f67fc2d1d4aff33c06".to_string())).unwrap();
+
+        assert_eq!(ori, "L1xDTJYPqhofU8DQCiwjStEBr1X6dhiNfweUhxhoRSgYyMJPcZ6B");
+    }
+
+    #[test]
+    fn test_original_after_migrate_kusama() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/949bada8-776c-4554-ad0c-001e3726a0f8.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+        assert!(ori.contains("FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8"));
+        let ori = ks.backup(&Key::DerivedKey("daa734e276c7420bd7eb6f9d59d39f3072d9ab0c4c0bda09eb410ab930c745302fb39714a2c4ca1935b18d1d216db11455a4c962daf8bf360ba41c65d872a5a8".to_string())).unwrap();
+        assert!(ori.contains("FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8"));
+    }
+
+    #[test]
+    fn test_original_after_migrate_file_coin() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/a7294912-b24f-44ba-86c1-48d76117808a.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        let expected_ori =
+            r#"{"Type":"secp256k1","PrivateKey":"o5JgTvwvrZwLPaQ7X2mKLj8nDxcNhZkSvg1UdCJ1xfY="}"#;
+        assert_eq!(ori, expected_ori.as_bytes().to_hex());
+
+        let ori = ks.backup(&Key::DerivedKey("bee56a3cc9e6536dd22a695742ff1b4a00a797fa6c0ddd6f2c3bfd2ec25d05d61918ab3ceaf5c135f771d957889ee2b361c5d70f1911cc8857299d349a0d9ee6".to_string())).unwrap();
+        let expected_ori =
+            r#"{"Type":"secp256k1","PrivateKey":"o5JgTvwvrZwLPaQ7X2mKLj8nDxcNhZkSvg1UdCJ1xfY="}"#;
+        assert_eq!(ori, expected_ori.as_bytes().to_hex());
+    }
+
+    #[test]
+    fn test_original_after_migrate_file_coin_bls() {
+        let json_str = include_str!(
+            "../../test-data/wallets-ios-2_14_1/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json"
+        );
+        let json = serde_json::from_str(json_str).unwrap();
+        let old_ks = KeystoreUpgrade::new(json);
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.upgrade(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        let expected_ori =
+            r#"{"Type":"bls","PrivateKey":"i7kO+zxc6QS+v7YygcmUYh7MUYSRes6anigiLhKF808="}"#;
+        assert_eq!(ori, expected_ori.as_bytes().to_hex());
+
+        let ori = ks.backup(&Key::DerivedKey("f3207a9f25adbdae5eff58bb13a9d9be4d763c6d47269fb14e4bd7a59ed667ba7282f1ba40746c60ae842c3f9dfeba91060f29f547ef2a94a66cfee93573ffaa".to_string())).unwrap();
+        let expected_ori =
+            r#"{"Type":"bls","PrivateKey":"i7kO+zxc6QS+v7YygcmUYh7MUYSRes6anigiLhKF808="}"#;
+        assert_eq!(ori, expected_ori.as_bytes().to_hex());
+    }
+}
diff --git a/token-core/tcx-migration/src/legacy_ipfs.rs b/token-core/tcx-migration/src/legacy_ipfs.rs
new file mode 100644
index 00000000..467b43d7
--- /dev/null
+++ b/token-core/tcx-migration/src/legacy_ipfs.rs
@@ -0,0 +1,51 @@
+use anyhow::anyhow;
+use serde::{Deserialize, Serialize};
+use std::fs;
+use std::io::Read;
+use tcx_constants::{coin_info_from_param, CurveType};
+use tcx_crypto::{Crypto, EncPair, Key};
+use tcx_keystore::identity::Identity;
+use tcx_keystore::keystore::{IdentityNetwork, Keystore, Metadata, Store};
+use tcx_keystore::{
+    fingerprint_from_private_key, fingerprint_from_seed, mnemonic_to_seed, Address, HdKeystore,
+    PrivateKeystore, Result, Source,
+};
+use tcx_primitive::{PrivateKey, Secp256k1PrivateKey, TypedPublicKey};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct IpfsInfo {
+    pub identifier: String,
+    pub ipfs_id: String,
+    pub enc_key: String,
+}
+
+pub fn read_legacy_ipfs_info(filepath: &str) -> Result<IpfsInfo> {
+    let mut identify_file = fs::File::open(&filepath)?;
+
+    let mut json_str = String::new();
+    identify_file.read_to_string(&mut json_str)?;
+    let ipfs_info: IpfsInfo = serde_json::from_str(&json_str)?;
+    Ok(ipfs_info)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::read_legacy_ipfs_info;
+    #[test]
+    fn test_scan_tcx_legacy_keystores() {
+        let ipfs_info = read_legacy_ipfs_info("../test-data/wallets/identity.json").unwrap();
+        assert_eq!(
+            ipfs_info.identifier,
+            "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg"
+        );
+        assert_eq!(
+            ipfs_info.ipfs_id,
+            "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU"
+        );
+        assert_eq!(
+            ipfs_info.enc_key,
+            "9513617c9b398edebfb46080a8f0cf6cab6763866bb06daa63503722bea78907"
+        );
+    }
+}
diff --git a/token-core/tcx-migration/src/lib.rs b/token-core/tcx-migration/src/lib.rs
new file mode 100644
index 00000000..445a231c
--- /dev/null
+++ b/token-core/tcx-migration/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod keystore_upgrade;
+pub mod legacy_ipfs;
+pub mod migration;
diff --git a/token-core/tcx-migration/src/migration.rs b/token-core/tcx-migration/src/migration.rs
new file mode 100644
index 00000000..7fea2d6b
--- /dev/null
+++ b/token-core/tcx-migration/src/migration.rs
@@ -0,0 +1,637 @@
+use anyhow::anyhow;
+use serde::{Deserialize, Serialize};
+use std::str::FromStr;
+use tcx_common::{FromHex, ToHex};
+use tcx_constants::{coin_info_from_param, CurveType};
+use tcx_crypto::{Crypto, EncPair, Key};
+use tcx_eos::encode_eos_wif;
+use tcx_eth::address::EthAddress;
+use tcx_keystore::identity::Identity;
+use tcx_keystore::keystore::{IdentityNetwork, Keystore, Metadata, Store};
+use tcx_keystore::{
+    fingerprint_from_private_key, fingerprint_from_seed, mnemonic_to_seed, Address, HdKeystore,
+    PrivateKeystore, Result, Source,
+};
+use tcx_primitive::{PrivateKey, Secp256k1PrivateKey, TypedPublicKey};
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(untagged)]
+pub enum NumberOrNumberStr {
+    Number(i64),
+    NumberStr(String),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct OldMetadata {
+    pub name: String,
+    pub chain_type: Option<String>,
+    pub chain: Option<String>,
+    pub network: Option<String>,
+    pub password_hint: Option<String>,
+    pub timestamp: NumberOrNumberStr,
+    pub source: Option<String>,
+    pub seg_wit: Option<String>,
+}
+
+impl OldMetadata {
+    pub fn to_metadata(&self) -> Metadata {
+        let timestamp = match &self.timestamp {
+            NumberOrNumberStr::Number(num) => *num,
+            NumberOrNumberStr::NumberStr(str) => {
+                f64::from_str(str).expect("f64 from timestamp") as i64
+            }
+        };
+
+        let network = if self.network.is_some()
+            && self
+                .network
+                .as_ref()
+                .unwrap()
+                .eq_ignore_ascii_case("TESTNET")
+        {
+            IdentityNetwork::Testnet
+        } else {
+            IdentityNetwork::Mainnet
+        };
+
+        let (source, identified_chain_types) =
+            self.source
+                .clone()
+                .map_or((Source::Mnemonic, None), |source| match source.as_str() {
+                    "RECOVERED_IDENTITY" => (Source::Mnemonic, None),
+                    "NEW_IDENTITY" => (Source::NewMnemonic, None),
+                    "KEYSTORE" => (Source::KeystoreV3, Some(vec!["ETHEREUM".to_string()])),
+                    "PRIVATE" => (Source::Private, Some(vec!["ETHEREUM".to_string()])),
+                    "WIF" => (Source::Wif, Some(vec!["BITCOIN".to_string()])),
+                    _ => (Source::from_str(&source).unwrap_or(Source::Mnemonic), None),
+                });
+
+        Metadata {
+            name: self.name.clone(),
+            password_hint: self.password_hint.clone(),
+            timestamp,
+            source,
+            network,
+            identified_chain_types,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct EOSKeyPath {
+    pub derived_mode: Option<String>,
+    pub path: Option<String>,
+    pub public_key: String,
+    pub enc_private: Option<EncPair>,
+    pub private_key: Option<EncPair>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LegacyKeystore {
+    pub version: i32,
+    pub id: String,
+    pub crypto: Crypto,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enc_mnemonic: Option<EncPair>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub xpub: Option<String>,
+    pub address: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mnemonic_path: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub im_token_meta: Option<OldMetadata>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub key_path_privates: Option<Vec<EOSKeyPath>>,
+}
+
+impl LegacyKeystore {
+    pub fn new_v3(private_key: &[u8], password: &str) -> Result<Self> {
+        let crypto = Crypto::new(password, private_key);
+        let sec_key = Secp256k1PrivateKey::from_slice(private_key)?;
+        let pub_key = TypedPublicKey::Secp256k1(sec_key.public_key());
+        let coin_info = coin_info_from_param("ETHEREUM", "", "", CurveType::SECP256k1.as_str())?;
+        let checksumed_address = EthAddress::from_public_key(&pub_key, &coin_info)?.to_string();
+        let address = checksumed_address
+            .to_lowercase()
+            .strip_prefix("0x")
+            .unwrap()
+            .to_string();
+        let id = uuid::Uuid::new_v4().to_string();
+        Ok(LegacyKeystore {
+            version: 3,
+            id,
+            crypto,
+            enc_mnemonic: None,
+            address: Some(address),
+            mnemonic_path: None,
+            im_token_meta: None,
+            xpub: None,
+            key_path_privates: None,
+        })
+    }
+
+    pub fn validate_v3(&self, password: &str) -> Result<()> {
+        let key = Key::Password(password.to_string());
+        let unlocker = self.crypto.use_key(&key)?;
+        let sec_key_bytes = unlocker.plaintext()?;
+        let sec_key = Secp256k1PrivateKey::from_slice(&sec_key_bytes)?;
+
+        let pub_key = TypedPublicKey::Secp256k1(sec_key.public_key());
+        let coin_info = coin_info_from_param("ETHEREUM", "", "", CurveType::SECP256k1.as_str())?;
+
+        let calc_address = EthAddress::from_public_key(&pub_key, &coin_info)?.to_string();
+        let calc_addr_bytes = &Vec::from_hex_auto(calc_address)?;
+        let addr_bytes = &Vec::from_hex_auto(self.address.clone().unwrap())?;
+
+        if calc_addr_bytes == addr_bytes {
+            Ok(())
+        } else {
+            Err(anyhow!("private_key_and_address_not_match"))
+        }
+    }
+
+    fn has_mnemonic(&self) -> bool {
+        // EOS wallet in iOS will contains an empty encMnemonic object, check the 20a9f050-7fd1-4f2c-b7f8-f03c78201f78 fixture kesytore
+        self.enc_mnemonic.is_some() && self.enc_mnemonic.as_ref().unwrap().enc_str != ""
+    }
+
+    pub fn from_json_str(keystore_str: &str) -> Result<LegacyKeystore> {
+        let keystore: LegacyKeystore = serde_json::from_str(keystore_str)?;
+        if keystore.version != 44
+            && keystore.version != 1
+            && keystore.version != 3
+            && keystore.version != 10001
+        {
+            return Err(anyhow!("unsupported version {}", keystore.version));
+        }
+
+        Ok(keystore)
+    }
+
+    pub fn migrate(&self, key: &Key, identity_network: &IdentityNetwork) -> Result<Keystore> {
+        let keystore = if self.has_mnemonic() {
+            self.migrate_to_hd(key, identity_network)?
+        } else {
+            self.migrate_to_private(key, identity_network)?
+        };
+        Ok(keystore)
+    }
+
+    fn migrate_to_hd(&self, key: &Key, identity_network: &IdentityNetwork) -> Result<Keystore> {
+        let unlocker = self.crypto.use_key(key)?;
+        let mnemonic_data = unlocker.decrypt_enc_pair(
+            self.enc_mnemonic
+                .as_ref()
+                .expect("the mnemonic must be set"),
+        )?;
+        let mnemonic = String::from_utf8(mnemonic_data.to_owned())?;
+        let seed = mnemonic_to_seed(&mnemonic)?;
+
+        let fingerprint = fingerprint_from_seed(&seed)?;
+        let meta = self
+            .im_token_meta
+            .as_ref()
+            .expect("migration to hd need imTokenMeta")
+            .to_metadata();
+
+        let identity = Identity::from_seed(&seed, &unlocker, &identity_network)?;
+
+        let enc_original = unlocker.encrypt_with_random_iv(mnemonic.as_bytes())?;
+        let mut store = Store {
+            id: self.id.to_string(),
+            version: HdKeystore::VERSION,
+            source_fingerprint: fingerprint,
+            crypto: self.crypto.clone(),
+            identity,
+            meta,
+            curve: None,
+            enc_original,
+        };
+
+        let derived_key = unlocker.derived_key();
+        store
+            .crypto
+            .dangerous_rewrite_plaintext(derived_key, &mnemonic_data)
+            .expect("encrypt");
+
+        let keystore = Keystore::Hd(HdKeystore::from_store(store));
+
+        Ok(keystore)
+    }
+
+    fn migrate_to_private(
+        &self,
+        key: &Key,
+        identity_network: &IdentityNetwork,
+    ) -> Result<Keystore> {
+        let unlocker = self.crypto.use_key(key)?;
+        let decrypted = unlocker.plaintext()?;
+        // Note legacy keystore only contains k1 curve
+        let curve = CurveType::SECP256k1;
+        let is_wif = decrypted.len() != 32;
+
+        // EOS Wif Keystore store the private key in key paths
+        let (private_key, original) = if let Some(key_paths) = &self.key_path_privates {
+            let enc_pair_decrypted = if let Some(enc_private) = &key_paths[0].enc_private {
+                unlocker.decrypt_enc_pair(enc_private)?
+            } else {
+                unlocker.decrypt_enc_pair(
+                    &key_paths[0]
+                        .private_key
+                        .as_ref()
+                        .expect("ios eos keystore should have private key"),
+                )?
+            };
+            (
+                Secp256k1PrivateKey::from_slice(&enc_pair_decrypted)?.to_bytes(),
+                encode_eos_wif(&enc_pair_decrypted)?.as_bytes().to_vec(),
+            )
+        } else if is_wif {
+            (
+                Secp256k1PrivateKey::from_wif(&String::from_utf8_lossy(&decrypted))?.to_bytes(),
+                decrypted,
+            )
+        } else if self.im_token_meta.is_some()
+            && self.im_token_meta.as_ref().unwrap().source == Some("KEYSTORE".to_string())
+        {
+            let v3_keystore = LegacyKeystore {
+                im_token_meta: None,
+                ..self.clone()
+            };
+            let ks_json = serde_json::to_string(&v3_keystore)?;
+            (decrypted, ks_json.as_bytes().to_vec())
+        } else {
+            (decrypted.clone(), decrypted.to_hex().as_bytes().to_vec())
+        };
+
+        let fingerprint = fingerprint_from_private_key(&private_key)?;
+        let im_token_meta = self
+            .im_token_meta
+            .as_ref()
+            .expect("migrate to private need imTokenMeta");
+
+        let identity =
+            Identity::from_private_key(&private_key.to_hex(), &unlocker, &identity_network)?;
+
+        let enc_original = unlocker.encrypt_with_random_iv(&original)?;
+
+        let mut store = Store {
+            id: self.id.to_string(),
+            version: PrivateKeystore::VERSION,
+            source_fingerprint: fingerprint,
+            crypto: self.crypto.clone(),
+            meta: im_token_meta.to_metadata(),
+            identity,
+            curve: Some(curve),
+            enc_original,
+        };
+
+        let unlocker = self.crypto.use_key(key)?;
+        let derived_key = unlocker.derived_key();
+        store
+            .crypto
+            .dangerous_rewrite_plaintext(derived_key, &private_key)
+            .expect("encrypt");
+
+        let mut keystore = Keystore::PrivateKey(PrivateKeystore::from_store(store));
+        keystore.unlock(key)?;
+
+        Ok(keystore)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::Value;
+    use tcx_btc_kin::BtcKinAddress;
+    use tcx_common::FromHex;
+    use tcx_constants::{CoinInfo, CurveType, TEST_PASSWORD, TEST_PRIVATE_KEY};
+    use tcx_crypto::Key;
+    use tcx_eos::address::{EosAddress, EosPublicKeyEncoder};
+    use tcx_eth::address::EthAddress;
+    use tcx_keystore::{keystore::IdentityNetwork, PublicKeyEncoder};
+
+    use super::LegacyKeystore;
+
+    fn v44_bitcoin_mnemonic_1() -> (&'static str, &'static str) {
+        (
+        include_str!("../tests/fixtures/02a55ab6-554a-4e78-bc26-6a7acced7e5e.json"),
+            "7f3ebdfe19a22e6a64be6834f61f9c79e9502a60e6b22f89654b1daae19ad2bf0c7556398713452d8bbecaae9cec1dbf116cfea89a15d4b1c23570fb95a34443",
+        )
+    }
+
+    fn eos() -> &'static str {
+        include_str!("../tests/fixtures/7f5406be-b5ee-4497-948c-877deab8c994.json")
+    }
+
+    fn v3_eos_private_key() -> (&'static str, &'static str) {
+        (include_str!("../tests/fixtures/42c275c6-957a-49e8-9eb3-43c21cbf583f.json"),
+            "6ecb361252e42b4f4e2dcd2e0c3331e8a58cb1522aee0dfad6d950b681d48fc78f11a3b12c05a56899339eef24109ea0c7c0287a1427232f04be9004fbf8f7b4")
+    }
+
+    fn v3_eth_private_key() -> (&'static str, &'static str) {
+        (
+            include_str!("../tests/fixtures/045861fe-0e9b-4069-92aa-0ac03cad55e0.json"),
+            "d71eb325f9c20b9d84cbf44bb9a952d9a27f92672ea04de44843ca6dca3214de81ed31e0d784cd8389231057f99f9bb7caecefb578b349a355c320cd47fbb6f2",
+        )
+    }
+
+    fn v3_eth_mnemonic() -> (&'static str, &'static str) {
+        (
+        include_str!("../tests/fixtures/175169f7-5a35-4df7-93c1-1ff612168e71.json"),
+           "3223cd3abf2422d0ad3503f73aaa6e7e36a555385c6825b383908c1e8acf5e9d9a4c751809473c75599a632fe5b1437f51a3a848e054d9c170f8c3b5c5701b8b",
+        )
+    }
+
+    fn identity() -> &'static str {
+        include_str!("../tests/fixtures/identity.json")
+    }
+
+    fn ios_metadata() -> (&'static str, &'static str) {
+        (
+        include_str!("../tests/fixtures/5991857a-2488-4546-b730-463a5f84ea6a"),
+        "3223cd3abf2422d0ad3503f73aaa6e7e36a555385c6825b383908c1e8acf5e9d9a4c751809473c75599a632fe5b1437f51a3a848e054d9c170f8c3b5c5701b8b",
+        )
+    }
+
+    fn metadata_missing_password_hint() -> (&'static str, &'static str) {
+        (
+        include_str!("../tests/fixtures/6f8c2912-ebe8-4359-90f4-f1d1f1af1e4d"),
+        "3223cd3abf2422d0ad3503f73aaa6e7e36a555385c6825b383908c1e8acf5e9d9a4c751809473c75599a632fe5b1437f51a3a848e054d9c170f8c3b5c5701b8b",
+        )
+    }
+
+    #[test]
+    fn test_eos_private_key() {
+        let (keystore_str, derived_key) = v3_eos_private_key();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+        let key = Key::DerivedKey(derived_key.to_owned());
+        let mut keystore = ks.migrate(&key, &IdentityNetwork::Testnet).unwrap();
+
+        let coin_info = CoinInfo {
+            coin: "EOS".to_string(),
+            derivation_path: "m/44'/194'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        keystore.unlock(&key).unwrap();
+        let eos_acc = keystore.derive_coin::<EosAddress>(&coin_info).unwrap();
+        let address = EosPublicKeyEncoder::encode(&eos_acc.public_key, &coin_info).unwrap();
+        assert_eq!(eos_acc.address, "",);
+
+        assert_eq!(
+            address,
+            "EOS8W4CoVEhTj6RHhazfw6wqtrHGk4kE4fYb2VzCexAk81SjPU1mL",
+        );
+    }
+
+    #[test]
+    fn test_is_same_derived_key() {
+        let (keystore_str, derived_key) = v44_bitcoin_mnemonic_1();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+        let keystore = ks
+            .migrate(
+                &Key::DerivedKey(derived_key.to_string()),
+                &IdentityNetwork::Testnet,
+            )
+            .unwrap();
+
+        let unlocker1 = ks
+            .crypto
+            .use_key(&Key::Password("imtoken1".to_string()))
+            .unwrap();
+        let unlocker2 = keystore
+            .store()
+            .crypto
+            .use_key(&Key::Password("imtoken1".to_string()))
+            .unwrap();
+
+        assert_eq!(unlocker1.derived_key(), unlocker2.derived_key());
+    }
+
+    #[test]
+    fn test_bitcoin_with_password() {
+        let (keystore_str, _) = v44_bitcoin_mnemonic_1();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+        let mut keystore = ks
+            .migrate(
+                &Key::Password("imtoken1".to_string()),
+                &IdentityNetwork::Testnet,
+            )
+            .unwrap();
+
+        assert_eq!(keystore.derivable(), true);
+        assert_eq!(keystore.id(), "02a55ab6-554a-4e78-bc26-6a7acced7e5e");
+
+        let coin_info = CoinInfo {
+            coin: "BITCOIN".to_string(),
+            derivation_path: "m/44'/0'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "TESTNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+
+        keystore.unlock_by_password("imtoken1").unwrap();
+
+        let acc = keystore.derive_coin::<BtcKinAddress>(&coin_info).unwrap();
+        assert_eq!("mhW3n3x8rvB5MmPXsbYDyfAGs8mhw9GGaW", acc.address);
+    }
+
+    #[test]
+    fn test_v3_ethereum_private_key() {
+        let (keystore_str, derived_key) = v3_eth_private_key();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+
+        //password Insecure Pa55w0rd
+        let key = Key::DerivedKey(derived_key.to_owned());
+        let mut keystore = ks.migrate(&key, &IdentityNetwork::Testnet).unwrap();
+
+        assert_eq!(keystore.derivable(), false);
+        assert_eq!(keystore.id(), "045861fe-0e9b-4069-92aa-0ac03cad55e0");
+
+        let coin_info = CoinInfo {
+            coin: "ETHEREUM".to_string(),
+            derivation_path: "".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        keystore.unlock(&key).unwrap();
+        let acc = keystore.derive_coin::<EthAddress>(&coin_info).unwrap();
+        assert_eq!("0x41983f2e3Af196C1Df429A3fF5cDECC45c82c600", acc.address);
+    }
+
+    #[test]
+    fn test_v3_ethereum_mnemonic() {
+        let (keystore_str, derived_key) = v3_eth_mnemonic();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+        //password imtoken1
+        let key = Key::DerivedKey(derived_key.to_owned());
+        let mut keystore = ks.migrate(&key, &IdentityNetwork::Testnet).unwrap();
+
+        assert_eq!(keystore.derivable(), true);
+        assert_eq!(keystore.id(), "175169f7-5a35-4df7-93c1-1ff612168e71");
+        let coin_info = CoinInfo {
+            coin: "ETHEREUM".to_string(),
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        keystore.unlock(&key).unwrap();
+        let acc = keystore.derive_coin::<EthAddress>(&coin_info).unwrap();
+        assert_eq!("0x6031564e7b2F5cc33737807b2E58DaFF870B590b", acc.address);
+    }
+
+    #[test]
+    fn test_ios_metadata() {
+        let (keystore_str, derived_key) = ios_metadata();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+        //password imtoken1
+        let key = Key::DerivedKey(derived_key.to_owned());
+        let mut keystore = ks.migrate(&key, &IdentityNetwork::Testnet).unwrap();
+
+        assert_eq!(keystore.derivable(), true);
+        assert_eq!(keystore.id(), "5991857a-2488-4546-b730-463a5f84ea6a");
+        let coin_info = CoinInfo {
+            coin: "ETHEREUM".to_string(),
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        keystore.unlock(&key).unwrap();
+        let acc = keystore.derive_coin::<EthAddress>(&coin_info).unwrap();
+        assert_eq!("0x6031564e7b2F5cc33737807b2E58DaFF870B590b", acc.address);
+        assert_eq!(
+            keystore.meta().password_hint,
+            Some("ios_password_hint".to_string())
+        );
+    }
+
+    #[test]
+    fn test_metadata_missing_password_hint() {
+        let (keystore_str, derived_key) = metadata_missing_password_hint();
+        let ks = LegacyKeystore::from_json_str(keystore_str).unwrap();
+        //password imtoken1
+        let key = Key::DerivedKey(derived_key.to_owned());
+        let mut keystore = ks.migrate(&key, &IdentityNetwork::Testnet).unwrap();
+
+        assert_eq!(keystore.derivable(), true);
+        assert_eq!(keystore.id(), "6f8c2912-ebe8-4359-90f4-f1d1f1af1e4d");
+        let coin_info = CoinInfo {
+            coin: "ETHEREUM".to_string(),
+            derivation_path: "m/44'/60'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        keystore.unlock(&key).unwrap();
+        let acc = keystore.derive_coin::<EthAddress>(&coin_info).unwrap();
+        assert_eq!("0x6031564e7b2F5cc33737807b2E58DaFF870B590b", acc.address);
+    }
+
+    #[test]
+    fn test_export_v3_keystore() {
+        let private_key_bytes = Vec::from_hex_auto(TEST_PRIVATE_KEY).unwrap();
+        let v3_keystore =
+            LegacyKeystore::new_v3(&private_key_bytes, TEST_PASSWORD).expect("v3 keystore");
+        let keystore_json = serde_json::to_string(&v3_keystore).expect("serde v3");
+
+        let json: Value = serde_json::from_str(&keystore_json).expect("json");
+
+        assert_eq!(json["version"], 3);
+        assert_eq!(json["address"], "6031564e7b2f5cc33737807b2e58daff870b590b");
+    }
+
+    #[test]
+    fn test_address_not_match() {
+        let private_key_bytes = Vec::from_hex_auto(TEST_PRIVATE_KEY).unwrap();
+        let mut v3_keystore =
+            LegacyKeystore::new_v3(&private_key_bytes, TEST_PASSWORD).expect("v3 keystore");
+        v3_keystore.address = Some("6031564e7b2f5cc33737807b2e58daff870b5900".to_string()); //wrong address
+        let validate_result = v3_keystore.validate_v3(TEST_PASSWORD);
+        assert_eq!(
+            validate_result.err().unwrap().to_string(),
+            "private_key_and_address_not_match".to_string()
+        );
+    }
+
+    #[test]
+    fn test_original_after_migrated_wif() {
+        let json_str =
+            include_str!("../../test-data/wallets-ios-2_14_1/9f4acb4a-7431-4c7d-bd25-a19656a86ea0");
+        let old_ks = LegacyKeystore::from_json_str(json_str).unwrap();
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.migrate(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        assert_eq!(ori, "L1xDTJYPqhofU8DQCiwjStEBr1X6dhiNfweUhxhoRSgYyMJPcZ6B");
+    }
+
+    #[test]
+    fn test_original_after_migrated_keystore_json() {
+        let json_str =
+            include_str!("../../test-data/wallets-ios-2_14_1/60573d8d-8e83-45c3-85a5-34fbb2aad5e1");
+        let old_ks = LegacyKeystore::from_json_str(json_str).unwrap();
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.migrate(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+        // ciphertext is 9b62...
+        assert!(ori.contains("9b62a4c07c96ca9b0b82b5b5eae4e7c9b2b7db531a6d2991198eb6809a8c35ac"));
+    }
+
+    #[test]
+    fn test_original_after_migrated_mnemonic() {
+        let json_str =
+            include_str!("../../test-data/wallets-ios-2_14_1/0597526e-105f-425b-bb44-086fc9dc9568");
+        let old_ks = LegacyKeystore::from_json_str(json_str).unwrap();
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.migrate(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        assert_eq!(
+            ori,
+            "inject kidney empty canal shadow pact comfort wife crush horse wife sketch"
+        );
+    }
+
+    #[test]
+    fn test_original_after_migrated_hex() {
+        let json_str =
+            include_str!("../../test-data/wallets-ios-2_14_1/f3615a56-cb03-4aa4-a893-89944e49920d");
+        let old_ks = LegacyKeystore::from_json_str(json_str).unwrap();
+        let key = Key::DerivedKey("0x79c74b67fc73a255bc66afc1e7c25867a19e6d2afa5b8e3107a472de13201f1924fed05e811e7f5a4c3e72a8a6e047a80393c215412bde239ec7ded520896630".to_string());
+        let ks = old_ks.migrate(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        assert_eq!(
+            ori,
+            "4b8e7a47497d810cd11f209b8ce9d3b0eec34e85dc8bad5d12cb602425dd3d6b"
+        );
+    }
+
+    #[test]
+    fn test_original_after_migrated_cosmos() {
+        let json_str =
+            include_str!("../../test-data/wallets-ios-2_14_1/ac59ccc1-285b-47a7-92f5-a6c432cee21a");
+        let old_ks = LegacyKeystore::from_json_str(json_str).unwrap();
+        let key = Key::Password(TEST_PASSWORD.to_string());
+        let ks = old_ks.migrate(&key, &IdentityNetwork::Mainnet).unwrap();
+        let ori = ks.backup(&key).unwrap();
+
+        assert_eq!(
+            ori,
+            "inject kidney empty canal shadow pact comfort wife crush horse wife sketch"
+        );
+    }
+}
diff --git a/token-core/tcx-migration/tests/fixtures/02a55ab6-554a-4e78-bc26-6a7acced7e5e.json b/token-core/tcx-migration/tests/fixtures/02a55ab6-554a-4e78-bc26-6a7acced7e5e.json
new file mode 100644
index 00000000..945adb7d
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/02a55ab6-554a-4e78-bc26-6a7acced7e5e.json
@@ -0,0 +1,41 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "437ef8c8553df9910ad117ecec5b8c05"
+    },
+    "ciphertext": "acabec2bd6fab27d867ebabe0ded9c64c85aebd294d29ecf537e563474ebb931522dbb977e0644830516550255edde02c507863cb083b55f2f0f759c2f8a885a81a6518237e7b65b7cf3e912fb36e42a13a7b2df3d401e5ff778a412a6d4c5516645770c4b12f2e30551542c699eef",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "33c8f2d27fe994a1e7d51108c7811cdaa2b821cc6760ed760954b4b67a1bcd8c"
+    },
+    "mac": "6b86a18f4ba9f3f428e256e72a3d832dcf0cd1cb820ec61e413a64d83b012059"
+  },
+  "id": "02a55ab6-554a-4e78-bc26-6a7acced7e5e",
+  "version": 44,
+  "address": "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN",
+  "encMnemonic": {
+    "encStr": "840fad94f4bf4128f629bc1dec731d156283cc4099e3c7659a3bf382031443fcdce6debaaef444393c446d2b4007064c010f6a442b3ad0ff0851c1bd638ba251afa92d3106457bd78c49",
+    "nonce": "4d691a7f0cb6396e96e8dc3e4f35dccd"
+  },
+  "info": {
+    "curve": "spec256k1",
+    "purpuse": "sign"
+  },
+  "mnemonicPath": "m/44'/1'/0'",
+  "xpub": "tpubDCpWeoTY6x4BR2PqoTFJnEdfYbjnC4G8VvKoDUPFjt2dvZJWkMRxLST1pbVW56P7zY3L5jq9MRSeff2xsLnvf9qBBN9AgvrhwfZgw5dJG6R",
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "BITCOIN",
+    "network": "TESTNET",
+    "name": "BTC",
+    "passwordHint": "",
+    "source": "RECOVERED_IDENTITY",
+    "walletType": "HD",
+    "timestamp": 1519611221,
+    "segWit": "NONE"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/045861fe-0e9b-4069-92aa-0ac03cad55e0.json b/token-core/tcx-migration/tests/fixtures/045861fe-0e9b-4069-92aa-0ac03cad55e0.json
new file mode 100644
index 00000000..469c25f0
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/045861fe-0e9b-4069-92aa-0ac03cad55e0.json
@@ -0,0 +1,30 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "a322450a5d78b355d3f10d32424bdeb7"
+    },
+    "ciphertext": "7323633304b6e10fce17725b2f6ff8190b8e2f1c4fdb29904802e8eb9cb1ac6b",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "51bcbf8d464d96fca108a6bd7779381076a3f5a6ca5242eb12c8c219f1015767"
+    },
+    "mac": "cf81fa8f858554a21d00a376923138e727567f686f30f77fe3bba31b40a91c56"
+  },
+  "id": "045861fe-0e9b-4069-92aa-0ac03cad55e0",
+  "version": 3,
+  "address": "41983f2e3af196c1df429a3ff5cdecc45c82c600",
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "ETHEREUM",
+    "mode": "NORMAL",
+    "name": "ETH-Wallet-2",
+    "passwordHint": "",
+    "source": "KEYSTORE",
+    "timestamp": 1519611469,
+    "walletType": "V3"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/175169f7-5a35-4df7-93c1-1ff612168e71.json b/token-core/tcx-migration/tests/fixtures/175169f7-5a35-4df7-93c1-1ff612168e71.json
new file mode 100644
index 00000000..adde34ef
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/175169f7-5a35-4df7-93c1-1ff612168e71.json
@@ -0,0 +1,35 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "3a442e8b02843edf71b8d3a9c9da2c3b"
+    },
+    "ciphertext": "fcbcceae1d239f9575c55f4c4f81eeba44a6ad9d948f544af2ffee9efef2c038",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "fa141145a343d9b6c7e2f12e0e56d564bc4d1b46cd48e8f7d898779e06357f1f"
+    },
+    "mac": "50ee3b40129c5f18f9ff6982db0eb18504ea2e8f3d96e4ac062b4eb5849cf011"
+  },
+  "id": "175169f7-5a35-4df7-93c1-1ff612168e71",
+  "version": 3,
+  
+  "address": "6031564e7b2f5cc33737807b2e58daff870b590b",
+  "encMnemonic": {
+    "encStr": "267bda938e4edbf7c420e89c59c6862f9127c7275d012b1b607f9e91ddb94574e81e94f6d8155e3c85ede03f584e09916122f03c72b67a1f96ddbf291beb46894d9a02d30170a9444692",
+    "nonce": "3cfe9f0b32b5d592e5fab54bd28863cd"
+  },
+  "mnemonicPath": "m/44'/60'/0'/0/0",
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "ETHEREUM",
+    "name": "ETH",
+    "passwordHint": "",
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": 1519611221,
+    "walletType": "V3"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/3831346d-0b81-405b-89cf-cdb1d010430e.json b/token-core/tcx-migration/tests/fixtures/3831346d-0b81-405b-89cf-cdb1d010430e.json
new file mode 100644
index 00000000..dc7d3276
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/3831346d-0b81-405b-89cf-cdb1d010430e.json
@@ -0,0 +1,42 @@
+{
+  "id": "3831346d-0b81-405b-89cf-cdb1d010430e",
+  "version": 44,
+  "crypto": {
+    "ciphertext": "24c8cffd810042cfddc9315993525e530432d9207b4b968a72393c9524e29d18b24b7c04f8f674ecddf00b7be4b0fd4a4d190b80aa9726d8a4bede9f97acac19b4accdcf1cbebed54f8d73978edc053ecaa3638835853822d4059134b55d1fa7147a1919e41c20c703448ee39de657",
+    "mac": "32d19c9b43f34a0362742e46907c9610b7cd01bae8b4ce4480aa6e8a403b04c6",
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "d56f5856edeb2a9b5bf93d9e0a9cc161"
+    },
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "dklen": 32,
+      "c": 65535,
+      "prf": "hmac-sha256",
+      "salt": "cf748fc0fc8b06d88e145a62f70c98d6726f4115f50088268fb60609186abc64"
+    }
+  },
+  "address": "2NCTX2isUH3bwkrSab6kJT1Eu9pWPqAStRp",
+  "encMnemonic": {
+    "encStr": "175c8cd7b0b97241a2c8d89d612033510ba6e5a92a586242bb48cf12debc704aff2af273814997bcec88a78367d22d046590d41e5beb3cc2348cafa32ac29fc2233c30d1503b9ccbc12f",
+    "nonce": "fcbd79db1493da089ed468bafec061ca"
+  },
+  "mnemonicPath": "m/44'/0'/0'",
+  "xpub": "tpubDDDcs8o1LaKXKXaPTEVBUZJYTgNAte4xj24MtFCMsfrHku93ZZjy87CGyz93dcocR6x6JHdusHodD9EVcSQuDbmkAWznWZtvyqyMDqS6VK4",
+  "info": {
+    "curve": "spec256k1",
+    "purpuse": "sign"
+  },
+  "imTokenMeta": {
+    "name": "name",
+    "passwordHint": "passwordHint",
+    "chainType": "BITCOIN",
+    "timestamp": 1526462133,
+    "network": "TESTNET",
+    "backup": [],
+    "source": "MNEMONIC",
+    "mode": "NORMAL",
+    "walletType": "HD",
+    "segWit": "P2WPKH"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/42c275c6-957a-49e8-9eb3-43c21cbf583f.json b/token-core/tcx-migration/tests/fixtures/42c275c6-957a-49e8-9eb3-43c21cbf583f.json
new file mode 100644
index 00000000..c7cf17d6
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/42c275c6-957a-49e8-9eb3-43c21cbf583f.json
@@ -0,0 +1,31 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "2cb9d4457b284e47877d08a5c9493b46"
+    },
+    "ciphertext": "17ff4858e697455f4966c6072473f3501534bc20deb339b58aeb8db0bd9fe91777148d0a909f679fb6e3a7a64609034afeb72a",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "37890eb305866aa07853d14e7666c2ed31e18efc1129f1c5a66b9cc93d03fd73"
+    },
+    "mac": "4906577f075ad714f328e7b33829fdccfa8cd22eab2c0a8bc4f577824188ed16"
+  },
+  "id": "42c275c6-957a-49e8-9eb3-43c21cbf583f",
+  "version": 3,
+  "address": "longhairzlh2",
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "EOS",
+    "mode": "NORMAL",
+    "name": "EOS-Wallet-1",
+    "network": "MAINNET",
+    "passwordHint": "",
+    "source": "WIF",
+    "timestamp": 1535426384,
+    "walletType": "V3"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/5991857a-2488-4546-b730-463a5f84ea6a b/token-core/tcx-migration/tests/fixtures/5991857a-2488-4546-b730-463a5f84ea6a
new file mode 100644
index 00000000..def9bbf0
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/5991857a-2488-4546-b730-463a5f84ea6a
@@ -0,0 +1,37 @@
+{
+  "id": "5991857a-2488-4546-b730-463a5f84ea6a",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "3a442e8b02843edf71b8d3a9c9da2c3b"
+    },
+    "ciphertext": "fcbcceae1d239f9575c55f4c4f81eeba44a6ad9d948f544af2ffee9efef2c038",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "fa141145a343d9b6c7e2f12e0e56d564bc4d1b46cd48e8f7d898779e06357f1f"
+    },
+    "mac": "50ee3b40129c5f18f9ff6982db0eb18504ea2e8f3d96e4ac062b4eb5849cf011"
+  },
+  "version": 3,
+  "address": "6031564e7b2f5cc33737807b2e58daff870b590b",
+  "encMnemonic": {
+    "encStr": "267bda938e4edbf7c420e89c59c6862f9127c7275d012b1b607f9e91ddb94574e81e94f6d8155e3c85ede03f584e09916122f03c72b67a1f96ddbf291beb46894d9a02d30170a9444692",
+    "nonce": "3cfe9f0b32b5d592e5fab54bd28863cd"
+  },
+  "mnemonicPath": "m/44'/60'/0'/0/0",
+  "imTokenMeta": {
+    "mode": "normal",
+    "chain": "ETHEREUM",
+    "segWit": "NONE",
+    "passwordHint": "ios_password_hint",
+    "backup": [],
+    "source": "RECOVERED_IDENTITY",
+    "version": "iOS-2.14.0.1742",
+    "name": "ETH",
+    "network": "MAINNET",
+    "timestamp": "1695800371.215641"
+  }
+}
diff --git a/token-core/tcx-migration/tests/fixtures/6f8c2912-ebe8-4359-90f4-f1d1f1af1e4d b/token-core/tcx-migration/tests/fixtures/6f8c2912-ebe8-4359-90f4-f1d1f1af1e4d
new file mode 100644
index 00000000..4dd2ffd1
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/6f8c2912-ebe8-4359-90f4-f1d1f1af1e4d
@@ -0,0 +1,36 @@
+{
+  "id": "6f8c2912-ebe8-4359-90f4-f1d1f1af1e4d",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "3a442e8b02843edf71b8d3a9c9da2c3b"
+    },
+    "ciphertext": "fcbcceae1d239f9575c55f4c4f81eeba44a6ad9d948f544af2ffee9efef2c038",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "fa141145a343d9b6c7e2f12e0e56d564bc4d1b46cd48e8f7d898779e06357f1f"
+    },
+    "mac": "50ee3b40129c5f18f9ff6982db0eb18504ea2e8f3d96e4ac062b4eb5849cf011"
+  },
+  "version": 3,
+  "address": "6031564e7b2f5cc33737807b2e58daff870b590b",
+  "encMnemonic": {
+    "encStr": "267bda938e4edbf7c420e89c59c6862f9127c7275d012b1b607f9e91ddb94574e81e94f6d8155e3c85ede03f584e09916122f03c72b67a1f96ddbf291beb46894d9a02d30170a9444692",
+    "nonce": "3cfe9f0b32b5d592e5fab54bd28863cd"
+  },
+  "mnemonicPath": "m/44'/60'/0'/0/0",
+  "imTokenMeta": {
+    "mode": "normal",
+    "chain": "ETHEREUM",
+    "segWit": "NONE",
+    "backup": [],
+    "source": "RECOVERED_IDENTITY",
+    "version": "iOS-2.14.0.1742",
+    "name": "ETH",
+    "network": "MAINNET",
+    "timestamp": "1695800371.215641"
+  }
+}
diff --git a/token-core/tcx-migration/tests/fixtures/7f5406be-b5ee-4497-948c-877deab8c994.json b/token-core/tcx-migration/tests/fixtures/7f5406be-b5ee-4497-948c-877deab8c994.json
new file mode 100644
index 00000000..0d5f670b
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/7f5406be-b5ee-4497-948c-877deab8c994.json
@@ -0,0 +1,51 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "dce8a7d8d80f7b0772d93d94ee0a88c2"
+    },
+    "ciphertext": "e00963172019129051f1abc699628a9ba929fcfa6bafbaeae95c2506dba74353",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "c2aa983c4dc4e8dee98584abf639a98bf5e9389d961ae23e764434c5b11e093c"
+    },
+    "mac": "aa29c325e8dddfbc7a9e614f78c52e95a2d94e4337f8d999da74397d837f3be0"
+  },
+  "id": "7f5406be-b5ee-4497-948c-877deab8c994",
+  "version": 10001,
+  "address": "longhairzlh2",
+  "encMnemonic": {
+    "encStr": "3a4e064bdd271f54e0b1b60cfbfd02a627acd9d22478b73d5fb53efd642c7c8a6fd6e63bf81d7a2d05487e3e316616249aa0978c93744baedd3a76dabbdfab297671d61d12130d883609a9f450623660a32e",
+    "nonce": "c20bed957c3abf241e3a9806db7314a4"
+  },
+  "mnemonicPath": "m/44'/194'",
+  "keyPathPrivates": [
+    {
+      "encPrivate": {
+        "encStr": "8657459f1ad4b7b8d2db4850b9072dab1da6d08cf248070068dc910df73c1dc5",
+        "nonce": "cb64438515ef2565b7d0d1a036297bbd"
+      },
+      "publicKey": "EOS8W4CoVEhTj6RHhazfw6wqtrHGk4kE4fYb2VzCexAk81SjPU1mL"
+    },
+    {
+      "encPrivate": {
+        "encStr": "a69a4614b1efa0bb9680d3ee28204bf86853511c58273cfb0829047e2da52d3f",
+        "nonce": "b1ce6665d381f7990222871452dceada"
+      },
+      "publicKey": "EOS6ES7TPo4UzNAvM3wrS1WxTpn3aZw8NDG6Vtb4xMvZZLDy9eJja"
+    }
+  ],
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "EOS",
+    "mode": "NORMAL",
+    "name": "EOS",
+    "passwordHint": "",
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": 1530537386,
+    "walletType": "HD_SHA256"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/04f85091-cf07-4761-8149-19c8e7dd39c5.json b/token-core/tcx-migration/tests/fixtures/android-2911/04f85091-cf07-4761-8149-19c8e7dd39c5.json
new file mode 100644
index 00000000..d365f5ce
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/04f85091-cf07-4761-8149-19c8e7dd39c5.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"1884003ad5eb0d70f10b5facf3960cd2"},"ciphertext":"bd19c41ecc30b63c9edbfd4ce87915b28808a5972710ecda70ea5bf58c85c7c7","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"e76d260e071eec570fda152f3cc2e13af291880cdc4d3cd89fb71c45d51edcf6"},"mac":"15ea5ad9b225107dfab8b50cf36e9dbe5fe2f605a5b349dd7e013a8b96c83c6b"},"id":"04f85091-cf07-4761-8149-19c8e7dd39c5","version":3,"address":"cosmos1uamn4ktpmes2efdf6qfh78m5cedkfctgat6eva","encMnemonic":{"encStr":"4e4876d41611f63f6f6724f1536921ef0428600fc4fba492400afc7a2102581f1787d533c6c638d83514d1041175df668809f15ab21a72e407ac98807119e1cbb47da50df10400a65aa15dce3fd4","nonce":"0b6cbccd7b1296c36aeb80ca8c923ad8"},"mnemonicPath":"m/44'/118'/0'/0/0","imTokenMeta":{"backup":[],"chainType":"COSMOS","mode":"NORMAL","name":"Cosmos","passwordHint":"","source":"RECOVERED_IDENTITY","timestamp":1703142299,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/399f5c5a-f2cb-45d3-9440-1b3c5c0cc39a.json b/token-core/tcx-migration/tests/fixtures/android-2911/399f5c5a-f2cb-45d3-9440-1b3c5c0cc39a.json
new file mode 100644
index 00000000..4da8dbda
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/399f5c5a-f2cb-45d3-9440-1b3c5c0cc39a.json
@@ -0,0 +1 @@
+{"id":"399f5c5a-f2cb-45d3-9440-1b3c5c0cc39a","version":11000,"keyHash":"65ef8802f5586caa90689752667875d66c1c60ae","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"f82be7c59aeef446234f154ed65e6af9"},"ciphertext":"4af8e8f3094630134d219e747876638b7520b6035528c77b8aae443e30957049619d94a8fd04d57f74f11d2ff25eea662408b073e20e7e5745ebff44acf0d071f8c2d695829563cc121a708075","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"5475dac37c5ddae2ce43b7220c65a875bbcc15165c3ece1fc00bdaba2f8380a9"},"mac":"31eeddeae9bec3d784e63d6e694ac5980956b6fe2a0be7576e5e037639ed5e58"},"activeAccounts":[{"address":"HtLiEZLd1LXwM5z5pELDNZ2diS668dmW7BPcUHcgN8GUoHJ","derivationPath":"","curve":"SubSr25519","coin":"KUSAMA","network":"","segWit":"","extPubKey":"","publicKey":"eaeb9a904be861ff6cb2fc2cea08d42c50e261d8472e29d92af1e0740535ef30"}],"imTokenMeta":{"name":"KSM","passwordHint":"","timestamp":1703147493,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/42688af7-ad87-42d2-ba2e-38d0d2d88c54.json b/token-core/tcx-migration/tests/fixtures/android-2911/42688af7-ad87-42d2-ba2e-38d0d2d88c54.json
new file mode 100644
index 00000000..c573fd60
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/42688af7-ad87-42d2-ba2e-38d0d2d88c54.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8ea181be1a98c85ab72aeb7d7930d746"},"ciphertext":"10ec357d8ffb70fd1f46bb0998d17caa6061b4118ca166a884b99cb9264d87e1ff8c743006a9c4bd85ef27081f7f2914d15f89fb","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d8d5840735ff95bac34a3828564ea7e77f234a5a37aaa64affc1537dfe049855"},"mac":"a2751db82bab66e71b10a0b84bd0e1696ec92c5d72cf91a9a4f05dd5f1d8484e"},"id":"42688af7-ad87-42d2-ba2e-38d0d2d88c54","version":3,"address":"3MevxiQXvYvw16v1v82YHY6AzuLRmFut2Z","imTokenMeta":{"backup":[],"chainType":"BITCOIN","mode":"NORMAL","name":"BTC","network":"MAINNET","passwordHint":"","segWit":"P2WPKH","source":"WIF","timestamp":1703146524,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/502bc8f1-4c4f-491e-8550-918c81389503.json b/token-core/tcx-migration/tests/fixtures/android-2911/502bc8f1-4c4f-491e-8550-918c81389503.json
new file mode 100644
index 00000000..184a0eb0
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/502bc8f1-4c4f-491e-8550-918c81389503.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"911816a288ce92b9fe971eb973df0bfe"},"ciphertext":"9d50ba54a6b0ec16a1ee5616e45e298640f50df70593b36ab35b42e8368fab62bfa24faddd19d164a768a319e3aeff0247f08852ba2bd36e81b54e0736cfa589f32a1bc1eceacde41e9f0f6c5d62b38284303bca200a4c9e04a23479db23dfe7e6e2b160657a522d05b470c6bb8387","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fb7ca24a119a25bb00a3551acc98bb776e1bb122a9a4a7e8fab47e735915e4f3"},"mac":"bcc5eb52450f386cc03ba64bfb0c566be3b3321b93c32fad19588b4bac1b1c04"},"id":"502bc8f1-4c4f-491e-8550-918c81389503","version":44,"address":"3GrvKsZWbb9ocBaNF7XosFZEKuCVBRSoiy","encMnemonic":{"encStr":"103d3d779ded3f0cf901a4f7788b003e16bbd499bf8929083cf57d659db222bb130e102f13c01f77908861c05851de9a77eca736040ddd52582b991408ad7ce46b9c1e41e959beb564a84e1877f7","nonce":"4a7095b8f59e1b5f4ae90071dacb4914"},"info":{"curve":"spec256k1","purpuse":"sign"},"mnemonicPath":"m/49'/0'/0'","xpub":"xpub6DDypLaY4E9gZvZuHpFfEREiHTNWymKBU4t16Xhmwqs9FfvomnkewjsnXquzJKzWH5H7fWF2q8uGWuKVzgNpSKJpAdmuafU5csCNvgKRS7f","imTokenMeta":{"backup":[],"chainType":"BITCOIN","mode":"NORMAL","name":"BTC","network":"MAINNET","passwordHint":"","segWit":"P2WPKH","source":"RECOVERED_IDENTITY","timestamp":1703142299,"walletType":"HD"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/54cc1a75-12e3-41b7-b1cc-71a67a2d185a.json b/token-core/tcx-migration/tests/fixtures/android-2911/54cc1a75-12e3-41b7-b1cc-71a67a2d185a.json
new file mode 100644
index 00000000..b9a52014
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/54cc1a75-12e3-41b7-b1cc-71a67a2d185a.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"78dd0e829cc86d50c2544d36106d4610"},"ciphertext":"86caa9f7b0c01c3c01d11bb44ee9c1cd6b9361479d9724350f8d83964609601582e99507e2dfa1c8c041859f9e9a217fa17b2439f49ff9f64b21a05b62ba58bd324ee48b833a43e1a5fe3877bc2c0dbe701970e56be7aba54bc7b7dbd5749d283c66593134acf05c54ed8bc828c2da","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d9a8b03d5b4c2c3173d573aa7974b09840fe8c0532fac6e27afd97146bf6dc04"},"mac":"9d1781dcd57733642238e537e3e5572e8b1a2f77c01dda6e8cb4a09752d24825"},"id":"54cc1a75-12e3-41b7-b1cc-71a67a2d185a","version":44,"address":"3MThxije1aUxcxbfe3DFABCSCD7DcRC2ry","encMnemonic":{"encStr":"5299ce314ef6926d93427f5610d805dd6ff86937ae971f9bccddab637bc229f697e53b3fb85fe6b5b6c587d9d328c8856cce0a229563ad80a5a26ac5edb311be7bf1d27423562bd2eb9160d3e51b","nonce":"6002b564f23591e6db2e54669612325a"},"info":{"curve":"spec256k1","purpuse":"sign"},"mnemonicPath":"m/49'/0'/0'","xpub":"xpub6C6Ac73WWSUjWqPxsEcqjXTjFKW9T8hvsrVucQ23nCjwBDeewefgKmFXZsUAPMxoFxBykYtBEg94Xv1MGfSDLgVeh9RTKgeyyp8WqXjJXcD","imTokenMeta":{"backup":[],"chainType":"BITCOIN","mode":"NORMAL","name":"q","network":"MAINNET","passwordHint":"","segWit":"P2WPKH","source":"MNEMONIC","timestamp":1703146419,"walletType":"HD"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/55569fb0-1642-497f-93b3-d788fbade733.json b/token-core/tcx-migration/tests/fixtures/android-2911/55569fb0-1642-497f-93b3-d788fbade733.json
new file mode 100644
index 00000000..a0204df4
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/55569fb0-1642-497f-93b3-d788fbade733.json
@@ -0,0 +1 @@
+{"id":"55569fb0-1642-497f-93b3-d788fbade733","version":11001,"keyHash":"15d00df778974f4c74b79f6f81e5e9359a92f4fd","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"621f2cad7717682b80301da119f1a158"},"ciphertext":"f189d0fb3edc1bc6d76d426999f0ef20f775ffc3395a964fb946bfefb5f986b7","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"b93088ee95ecfa84ed59a8b55284ce54ecea34a65bc776811af25ef635061b31"},"mac":"b662410cd32f82a7bd5dc5a189738c0a05c38096097191f71a95b495e750be29"},"activeAccounts":[{"address":"TRHRgRmiojWogd5CZ1sr5AUrDh3gCRdaeA","derivationPath":"","curve":"SECP256k1","coin":"TRON","network":"","segWit":"","extPubKey":"","publicKey":"024e617c11eb09b5d1f80ad36c0437aa354b717ed0cdb0cbb536ca9aa4b1417891"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703146648,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/576350d1-c863-45d4-aee5-5e111a00fc91.json b/token-core/tcx-migration/tests/fixtures/android-2911/576350d1-c863-45d4-aee5-5e111a00fc91.json
new file mode 100644
index 00000000..7a93b1fa
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/576350d1-c863-45d4-aee5-5e111a00fc91.json
@@ -0,0 +1 @@
+{"id":"576350d1-c863-45d4-aee5-5e111a00fc91","version":11001,"keyHash":"e56a46fd4ba98725a7691d1dc5f413773d6c9734","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"2a6245f6abb85b04a999ddfca0b990e6"},"ciphertext":"9e5231c7fc2dbbdd5ffec6da907aa2be3c3b35145ac6e3f81accb4d5049f7ff7","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"00c969c54c468c45b6d4c3e358b3296dd64c96179ff8d118098e58bf47e27584"},"mac":"14abd53618c2a24faf3c82af0b377ce0ae6b27f85501e6cafe67d689c1e981bb"},"activeAccounts":[{"address":"Leb3SsP1g3vbhqbZuMtXkM2Rp3swH9U2Ab","derivationPath":"","curve":"SECP256k1","coin":"LITECOIN","network":"MAINNET","segWit":"NONE","extPubKey":"","publicKey":"024464748785461beae1d0071350f1696dd384d451d301b614e79001b10abd9eab"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703146764,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/577e0968-e044-43c3-9cb8-cb1e3a199529.json b/token-core/tcx-migration/tests/fixtures/android-2911/577e0968-e044-43c3-9cb8-cb1e3a199529.json
new file mode 100644
index 00000000..64b4bc51
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/577e0968-e044-43c3-9cb8-cb1e3a199529.json
@@ -0,0 +1 @@
+{"id":"577e0968-e044-43c3-9cb8-cb1e3a199529","version":11000,"keyHash":"5836e0dc61856ef0d5acdc8bf4be7417eabdbfd8","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"611058112e196f9ddbdf2208e8f9dfcb"},"ciphertext":"c66991516ed8a26f42d15942f0c64c8a6a60928116d8570dd833735baa4db1f3bd9bb74427c557692cfc65d442911d5a9b2e8f441a9c2fd0734b1dd8c9cb72cd629221e87323","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"32a4bc73f2372cb23e76a4c943ad167ad656554f0e04e5ebd158ab1a95d78fd0"},"mac":"13b29a21d2d6297c7e8250da2a95bc199d752ce33a8309d41185de8c93bf2833"},"activeAccounts":[{"address":"ckb1qyqwkhy9v6a66twu2vca8220zwlve0ffw3cqxcqz6t","derivationPath":"m/44'/309'/0'/0/0","curve":"SECP256k1","coin":"NERVOS","network":"MAINNET","segWit":"","extPubKey":"030f2d87a48000000072232d1b9f2c5e7adf4d66eb694501495aa49c183b9bfe802b09f08d57f9d4e60324fbeb2aaee907c12a59bea1928f16710b13b4f2af8e237f78256abe6f553c56","publicKey":"03304805c83ba70d3c6a4c75c7916d3f8ae5d06485a1bbf81cc484bf646f5f346f"}],"imTokenMeta":{"name":"CKB","passwordHint":"","timestamp":1703147329,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/5e870760-0e65-4e2c-a56b-f57c340cfc49.json b/token-core/tcx-migration/tests/fixtures/android-2911/5e870760-0e65-4e2c-a56b-f57c340cfc49.json
new file mode 100644
index 00000000..20031c84
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/5e870760-0e65-4e2c-a56b-f57c340cfc49.json
@@ -0,0 +1 @@
+{"id":"5e870760-0e65-4e2c-a56b-f57c340cfc49","version":11001,"keyHash":"e54a26143f6ab316ef12156460e9e79a3a8a1cfd","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"bfec1c3ceaf62c5b4a46da7c78a6eaac"},"ciphertext":"01b09436f734e644f7b0e4bde739edd398f3a9b5d685aad43e65b076ec206b953ddff0a00f726d7ef31168f7632eeaff520fbd8fa0aa9d4a25cae57e8ed566a4","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"116e94744e773c3d240471862e8e29c9bfbadb2969a4005003abb83337291d7e"},"mac":"27fde5f59e139eb8de7a3e598bd7d85a23fe24d850857109cc86d70b655b8f6a"},"activeAccounts":[{"address":"HcT5ZuNoranNeBZ6yxYMDdgYVdPs8nq18vV9hEh6XCTCFdH","derivationPath":"","curve":"SubSr25519","coin":"KUSAMA","network":"","segWit":"","extPubKey":"","publicKey":"decd1d0057265f0963197aa8252acf5135ac7dfcf81de55770d40e6e748ed902"}],"imTokenMeta":{"name":"ksmaccount","passwordHint":"","timestamp":1703147836,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/69b2d6a0-e57b-4152-bb02-0cc43fb561cb.json b/token-core/tcx-migration/tests/fixtures/android-2911/69b2d6a0-e57b-4152-bb02-0cc43fb561cb.json
new file mode 100644
index 00000000..8e71acdb
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/69b2d6a0-e57b-4152-bb02-0cc43fb561cb.json
@@ -0,0 +1 @@
+{"id":"69b2d6a0-e57b-4152-bb02-0cc43fb561cb","version":11000,"keyHash":"4bda2074feedc8fc0beb60c20aae7307f1605d3f","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"eaf1600878711dc274d87c28006da421"},"ciphertext":"3b35586a44d024b7256a9a7eb6ec9c8e15448cb32f115ce937bc6f5fdcf6fdf138eb7fa8095848233918bdb3e35cdde6d3655331ad9c70150078010adf897fae599d64219ed4c3fe7f","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"50a74153f540e0b07d71fe7c5de24e790ee6346c6b43a079f09311a60bfe6995"},"mac":"d480884b0b84fc63aae24b49e73c4b8dc57c13199eb25513ecec7c8aab6530cf"},"activeAccounts":[{"address":"13NKXSJ9JumkcT2JxJL2ybHD7Gqk6jJc6xRSgTgx2uQyJopN","derivationPath":"","curve":"SubSr25519","coin":"POLKADOT","network":"","segWit":"","extPubKey":"","publicKey":"68bafaf50988526c046d9ae62a1c13dbd5eee90623b484b019d040e0969f280e"}],"imTokenMeta":{"name":"DOT","passwordHint":"","timestamp":1703147575,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/734e3c8a-f1a4-40a8-9be8-0ab3076d3190.json b/token-core/tcx-migration/tests/fixtures/android-2911/734e3c8a-f1a4-40a8-9be8-0ab3076d3190.json
new file mode 100644
index 00000000..9bfd36bc
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/734e3c8a-f1a4-40a8-9be8-0ab3076d3190.json
@@ -0,0 +1 @@
+{"id":"734e3c8a-f1a4-40a8-9be8-0ab3076d3190","version":11000,"keyHash":"abfdd7d03dece13a5a4c82ff078299373ac053d2","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"1f08165f28a2b1f2939a6220dcd5b059"},"ciphertext":"669b047c97685bd60eb3474917a3382d653e895ca00836f5467cbca217c9a6fc9588f8cdc13e717ae21f30d74da382381a18a37d798039cae6dcc20c1d6e4c61d4e992380dfe84d39c9ad2","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"7b81dee71fd5d3b305dc77f720a4cb63a21fe25a514cc027319bb4d2c0aed180"},"mac":"23dc93902af8c6d14e885c9bbbd230da171acd9df159db4077465d2a2e2d8273"},"activeAccounts":[{"address":"tz1Xe6nGDujpwRCDsaJnJnvXEW9mLiK8PxSr","derivationPath":"m/44'/1729'/0'/0'","curve":"ED25519","coin":"TEZOS","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"656bd042b0cee8d9791a256204754111c3a85ef59b20327c553db71c26e0767e"}],"imTokenMeta":{"name":"XTZ","passwordHint":"","timestamp":1703147647,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/7c3db9bb-b714-4698-a1a3-64473dce6841.json b/token-core/tcx-migration/tests/fixtures/android-2911/7c3db9bb-b714-4698-a1a3-64473dce6841.json
new file mode 100644
index 00000000..618a975e
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/7c3db9bb-b714-4698-a1a3-64473dce6841.json
@@ -0,0 +1 @@
+{"id":"7c3db9bb-b714-4698-a1a3-64473dce6841","version":11000,"keyHash":"eb2d06946e5a415bddcb5d2f27ddee5482c69d35","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8bcc45a2ef0a95d29d1c20cd3833e783"},"ciphertext":"9ef250df3a9a466d939367a99fe51e6d111fc18a1dd8fd2a411a612de249a850914fdc54b6ae583fe9b31c020dcc6352e7211f198f0995629e2d0fa254ef625b6d3570b2e3f10fccc2174a83","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"f2234eea5ea12587934405bfddeb449086e2f5f518de6e9b1563995d7e181fc7"},"mac":"6799b968f46ab61abfd2c69c3a40dca8de92cabde26c7821d241bb224ed516c3"},"activeAccounts":[{"address":"TYRPcc7copkP1Ys3qXgrUz9EgVbB16SgjC","derivationPath":"m/44'/195'/0'/0/0","curve":"SECP256k1","coin":"TRON","network":"","segWit":"","extPubKey":"0302c05437800000002af86b9f33d671140a9b93bc89f7d8402c4618ee63ed41cecce6117de6d47eff0356f2a3d0f5ccce561020f66431bf0684fdbe4cff5d7fee063a5a5521d0c24c64","publicKey":"0312033597015beb64deca84fc9063f1f09878b0859bcc2a2eeafbb4edfaea2f34"}],"imTokenMeta":{"name":"TRX","passwordHint":"","timestamp":1703147268,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/7c5b41ce-2bee-4797-b795-8150979e6248.json b/token-core/tcx-migration/tests/fixtures/android-2911/7c5b41ce-2bee-4797-b795-8150979e6248.json
new file mode 100644
index 00000000..57d2c94c
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/7c5b41ce-2bee-4797-b795-8150979e6248.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"e89e3ecc2310be9d437dc7c90a4b6708"},"ciphertext":"0d299c624a4f93a2ae7941a6a76ea2265c3454c88e745a1bcf3e3a99e4291c94","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"2fb2930cfeedb5ba28c210a82a9cab533c9fb5e85f788791f924d961f9a7f913"},"mac":"5c3456806427dd648f44c7bd2d9126cf51b2374d039f919a77ff12c538c3d74d"},"id":"7c5b41ce-2bee-4797-b795-8150979e6248","version":3,"address":"6e7a4babe0b6e5f5a42584e7b39f883e1309ae8e","imTokenMeta":{"backup":[],"chainType":"ETHEREUM","mode":"NORMAL","name":"ETH","passwordHint":"","source":"PRIVATE","timestamp":1703146269,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/85eb7383-ab01-4491-bfef-708b7ab63fcd.json b/token-core/tcx-migration/tests/fixtures/android-2911/85eb7383-ab01-4491-bfef-708b7ab63fcd.json
new file mode 100644
index 00000000..ae731bcc
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/85eb7383-ab01-4491-bfef-708b7ab63fcd.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"72d302ed386d2a36f0a3dced42dd7c10"},"ciphertext":"2df620d7b9442893fb18654f0b842a1aac5c017199965df753f4655e98f9297ff69c8e52109f53415a77226b6233a9de32d8cedd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"ed5c8c31fcbe28ca4828fc4e0db5779eddfe47da5099d9b5a51bffa728268958"},"mac":"60fae301323b3e2f341c5a1e9f173dbc3887af2e2f1de5f062457a297404afa8"},"id":"85eb7383-ab01-4491-bfef-708b7ab63fcd","version":3,"address":"3Queirt71jUF43DAbxsdhCrZx8Eqrcc2NT","imTokenMeta":{"backup":[],"chainType":"BITCOIN","mode":"NORMAL","name":"BTC","network":"MAINNET","passwordHint":"","segWit":"P2WPKH","source":"WIF","timestamp":1703146483,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/9c6c8a23-5026-4acd-b124-bc789766ae63.json b/token-core/tcx-migration/tests/fixtures/android-2911/9c6c8a23-5026-4acd-b124-bc789766ae63.json
new file mode 100644
index 00000000..1aaa4b57
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/9c6c8a23-5026-4acd-b124-bc789766ae63.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d13b7db3e0a2e18c99d4641616bab319"},"ciphertext":"86703d848e84b58a7522726f20fee805000ab1f1e6f6ac1a83806ceb2a2ba93e","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"436e172646c923afb562853cce775ad089fc1f3f4c38fddb23f17fc3c7272c6e"},"mac":"0174e0d854030df3f61fc01fd6e94cd74bae2ecb5440279e49eea2d5a776f9f6"},"id":"9c6c8a23-5026-4acd-b124-bc789766ae63","version":3,"address":"92ea28cfd60e38228bf23efe02bc390afaea84e8","imTokenMeta":{"backup":[],"chainType":"ETHEREUM","mode":"NORMAL","name":"ETH","passwordHint":"","source":"KEYSTORE","timestamp":1703146352,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/aa1f67af-5237-43b8-af55-8e65b66deedc.json b/token-core/tcx-migration/tests/fixtures/android-2911/aa1f67af-5237-43b8-af55-8e65b66deedc.json
new file mode 100644
index 00000000..54225382
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/aa1f67af-5237-43b8-af55-8e65b66deedc.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"077980d5b9ccd7f599f9f61de3899ce7"},"ciphertext":"8352024d521b9311d636c4c05158c0a58d42dcb22580ce44912ff5706d1d0a2a","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"40cbf197aad6b6300812325e8aa362c78a09fc5b881dab9c1e22d421c898013b"},"mac":"4ef579a2385b6bd153da723ef30278ed41f6024f0ce721d3cf9b1dd2b3b01686"},"id":"aa1f67af-5237-43b8-af55-8e65b66deedc","version":3,"address":"cosmos1v7966heram5mpam396fmlq2nfmlaj2rgn0nrcf","encMnemonic":{"encStr":"151d05e5f0930d689141fe70d414d3947eee25cddab05ad37235aba3e6ec75dd14a4f2ba8424096bb6ff00db90ad6b7ff6b01aadbb6aa95767a4e0adeba84efd914be98dccfc23940b7840c4","nonce":"e6bca0bda31f69d316e7eb935a84c2c7"},"mnemonicPath":"m/44'/118'/0'/0/0","imTokenMeta":{"backup":[],"chainType":"COSMOS","mode":"NORMAL","name":"ATOM","network":"MAINNET","passwordHint":"","segWit":"NONE","source":"MNEMONIC","timestamp":1703147215,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/b16bc74d-a80d-4d9f-b600-143a27c9c2df.json b/token-core/tcx-migration/tests/fixtures/android-2911/b16bc74d-a80d-4d9f-b600-143a27c9c2df.json
new file mode 100644
index 00000000..edc9840f
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/b16bc74d-a80d-4d9f-b600-143a27c9c2df.json
@@ -0,0 +1 @@
+{"id":"b16bc74d-a80d-4d9f-b600-143a27c9c2df","version":11000,"keyHash":"e0e066e7c3584c855e00999e78d7cf72a2c7600b","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"5e36d794666258e2006b7c90f09350c0"},"ciphertext":"8fe45be7a680f3cbf16b9b22120a18b19cdaae2ed8c3718a9568891c40e4698b722006fa62a610ddb6263ea78cf6435c0295d6830a5a90bc72147676f1df2181c7e4fb61f4db8eb45e6d","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"729800fe4ffebbfb2816816610e7524cf1e98dfc243c52a0178310b69e1b0f9b"},"mac":"423b5e76de0003df1ff6d5a3d185c4b7dd1cda468d489344757fe1be645f36b6"},"activeAccounts":[{"address":"qzdzglxnu4e4q2evm3rmluf4lu8ncpg7kyuh9mcedg","derivationPath":"m/44'/145'/0'/0/0","curve":"SECP256k1","coin":"BITCOINCASH","network":"MAINNET","segWit":"NONE","extPubKey":"0347a1941e80000000cc4628abe582ee905048c9ee6c5a8dbb328ac14bed88fc8a5636916f2f173859027c47aadeb2ff10290549e5fb48161f106d566e807cf338aca55f2b6dd1c1daf0","publicKey":"0252f2415c6daa297f2fba5aea2b73b9b70a956ed532db83c11405708678658439"}],"imTokenMeta":{"name":"BCH","passwordHint":"","timestamp":1703147373,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/b42279e9-38a8-4d06-b4ac-dbd19e552cdc.json b/token-core/tcx-migration/tests/fixtures/android-2911/b42279e9-38a8-4d06-b4ac-dbd19e552cdc.json
new file mode 100644
index 00000000..f6f55946
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/b42279e9-38a8-4d06-b4ac-dbd19e552cdc.json
@@ -0,0 +1 @@
+{"id":"b42279e9-38a8-4d06-b4ac-dbd19e552cdc","version":11001,"keyHash":"b3a8638a2c5bdfb7501b86a016203ab84bf25e3c","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8dbcd67707ec6f11106c38ca3ccd61ac"},"ciphertext":"825f9016722ac86b471c47b0b810c5cf70dc8331df0032c97b39b7942ac9731a","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"e705960a3f2a8c800f1279b5cc3c410b353418501b3f434ec59c4d8764b76d35"},"mac":"0d94ec02b15a37acb2ef643d6b6cbc08ac991297cafa2c88754d80660947745b"},"activeAccounts":[{"address":"qqujm2a20cqgne53t7xhtgv4axn5ypn6lvxr0ytypq","derivationPath":"","curve":"SECP256k1","coin":"BITCOINCASH","network":"MAINNET","segWit":"NONE","extPubKey":"","publicKey":"02b364d43cc7b6d4d8141a5a9bc864fae69658c0c2359f63e57fec3581b6716654"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703146706,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/b6092d42-155c-4e94-ba09-0ffc7a35523e.json b/token-core/tcx-migration/tests/fixtures/android-2911/b6092d42-155c-4e94-ba09-0ffc7a35523e.json
new file mode 100644
index 00000000..c35b8c0a
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/b6092d42-155c-4e94-ba09-0ffc7a35523e.json
@@ -0,0 +1 @@
+{"id":"b6092d42-155c-4e94-ba09-0ffc7a35523e","version":11000,"keyHash":"de09a8bae8bf7d5db1aaa48947fdc5ad3da75fbe","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"17eb3cf28bc919445819bda34909e5eb"},"ciphertext":"8d86aa0c8c859015fcebecc38fa9a4b8023393164b5c98d58a50b5ad915af9fb29605b2c44409c3fb4ca73f34128dc0124dfd8f99ea782a0172d0a01a39efbf9a09eb3c65ac1de1f484b4c197011d67e5e6f2fe43b576d","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"bb5b1974c5cfdcf5d4a30a4901e52f68b074bd6e8fd4f0d47405b76fc2997148"},"mac":"9c7e505230d6c7ef6422e6642c353aca20f2d69ff8e9808044e08522f9cc0cc2"},"activeAccounts":[{"address":"f1qn6chi4eghpm3frta7slxmp2nqlap6vwsz7bkwq","derivationPath":"m/44'/461'/0'/0/0","curve":"SECP256k1","coin":"FILECOIN","network":"MAINNET","segWit":"","extPubKey":"0343ab5bb180000000ef03b83e7546000c28e3fe7387c1c9bb1792c7a65d41db1a038cc98ae335b0c003b120fa8ae48498bae9f35d0ff800a9d4164604fe92d0f495526ca876a5742235","publicKey":"0327ac195875d5c3498e2b2f2911b4862ca0106c6b6b8f0edfa4720fc3f0268e77"}],"imTokenMeta":{"name":"FIL","passwordHint":"","timestamp":1703147612,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/b6678054-a3f2-4ee6-8ec4-5c37fabbc1f0.json b/token-core/tcx-migration/tests/fixtures/android-2911/b6678054-a3f2-4ee6-8ec4-5c37fabbc1f0.json
new file mode 100644
index 00000000..310f31a9
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/b6678054-a3f2-4ee6-8ec4-5c37fabbc1f0.json
@@ -0,0 +1 @@
+{"id":"b6678054-a3f2-4ee6-8ec4-5c37fabbc1f0","version":11001,"keyHash":"e0d650a880f2cbbd8302483a06939cd3431592d8","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"a4631f41198087bfaaa34e44a0ddcaba"},"ciphertext":"b05948e2184efc8de9d99a9c1c5fcf1be4526c2764f0e7a1e25ef788d125da84","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"027976e446274d4b81cea8ec2c15ca0a4de8f6ad8527c411d86359623e5ab3a5"},"mac":"1be1b33fbcae40142cc130074be433e4c767922b1fe9d1eac555f5efc0f8849a"},"activeAccounts":[{"address":"f3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa","derivationPath":"","curve":"BLS","coin":"FILECOIN","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"80f0d9dfb26b6c66254fd6663f4cbe39c4ca46e54f779c2e30c618fb57350e5b7f55b51c16e04c9d2550f3b731551ed7"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703147748,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/bea65809-2e16-46af-a2ab-21f034c149a8.json b/token-core/tcx-migration/tests/fixtures/android-2911/bea65809-2e16-46af-a2ab-21f034c149a8.json
new file mode 100644
index 00000000..fc641b18
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/bea65809-2e16-46af-a2ab-21f034c149a8.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"3565425016124081dbed4207bfeb0666"},"ciphertext":"f9d9ab49dabc663aabd604261dda83115310152a7f1404d6d66fdddb319b9be4","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"59c359906f1c2c0e4b4650cbb9a14da6880763ce54b5bf4020a4ec2802da12e3"},"mac":"092f469d7971e4999e015b2df39638039796bac7476c4f67633aba336e7ae5f2"},"id":"bea65809-2e16-46af-a2ab-21f034c149a8","version":3,"address":"de860ba6d95e4d06cfe3943347a77659171474a2","encMnemonic":{"encStr":"ed950ea53a47f1ad0df4e027f3a31b747d59db9fc1f426489e6f5ba9a6b9f1ded0a14d2396a622ff5d19fd0e088b426ce3b1488e1f7e740a55897bb37429d1de50dcb3acfe7f0588e23b90c8","nonce":"4430a66f80d6c6003f7d5c44131ac25f"},"mnemonicPath":"m/44'/60'/0'/0/0","imTokenMeta":{"backup":[],"chainType":"ETHEREUM","mode":"NORMAL","name":"ETH","passwordHint":"","source":"MNEMONIC","timestamp":1703147196,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/c3484a0e-b397-4904-bfa6-bcec59bc8354.json b/token-core/tcx-migration/tests/fixtures/android-2911/c3484a0e-b397-4904-bfa6-bcec59bc8354.json
new file mode 100644
index 00000000..ab10f0f4
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/c3484a0e-b397-4904-bfa6-bcec59bc8354.json
@@ -0,0 +1 @@
+{"id":"c3484a0e-b397-4904-bfa6-bcec59bc8354","version":11000,"keyHash":"86099dec9c87f461b194a8312e126cfdd6752b00","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8611d509b43a69f9d103f1706a5f98a1"},"ciphertext":"75f6801abdf30136c2006626c19e68ae3873aa865d89ea45a55491d9051a763fdee949da805b52e2d4093518ab64a1c958c0ed1aff4459964f0057aeb08bf1f5cb8e56ced060d9d4d9072417fcbd","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"25911a19a487bd3570d39add374dd74c91973d9cb78d4b3b2a4c82db842ac9a5"},"mac":"d6953c0edce839f63f65b8efe89f501805f1eb6d08a6c47983dbcbda112a0a64"},"activeAccounts":[{"address":"TCc6TiMqBRGNqgu21WRdmxCiXcNM1cCkh8","derivationPath":"m/44'/195'/0'/0/0","curve":"SECP256k1","coin":"TRON","network":"","segWit":"","extPubKey":"03b4d388ac800000002f1e95df20e0c33b0710d20bf056ffa4a106113ac277bdebdba34e1f60e2c411027b8feb0478ef96fff19bdd8ddc0471e8cc187f048275dcf4b4155ac6e5222392","publicKey":"02737533c97c7a0595f44bb5e8f56240b0df0aa68dbe1b07fc3bdc2ef22f680751"},{"address":"ckb1qyqd2p40gft4gga8f9lcsqr8xsn25fmepf9qea7nsp","derivationPath":"m/44'/309'/0'/0/0","curve":"SECP256k1","coin":"NERVOS","network":"MAINNET","segWit":"","extPubKey":"03b35c18a180000000f5c47a60d95c0f2fda9b6a200c6cdc63b125280b8c3d75e657ef14dc5f176adb0259639ef165ed8c3f017136657d44b5c51e3333f8c00db79b0a60a6a740c17639","publicKey":"03eecb48803f1b28f3b49beffa971055f9f452674b6f67895aa327f00d455ad4c8"},{"address":"qpz67gcwa9ag84ljmmn3u7tcjm9rkc2jfcjk2qzfcu","derivationPath":"m/44'/145'/0'/0/0","curve":"SECP256k1","coin":"BITCOINCASH","network":"MAINNET","segWit":"NONE","extPubKey":"03d57de789800000009496c8b225bdba0ad861d7300e68710c321999a635d8eddaaaa7706fd66c3236028492ad48cbd286675195e75f20e147650a5203298d0b90aeac933f77dba4767b","publicKey":"0257cea83173f4b54db4f50f198480b0c06c5e859d6219b379141f243474cfb239"},{"address":"LcQQS9ERgUGbMCQELYAj9LsGCqJzYsctWu","derivationPath":"m/44'/2'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"MAINNET","segWit":"NONE","extPubKey":"038a97b64e80000000dad1f03108773646edd2589ec21c761db2c853bef4d56363a1cc130bdb930778020fb6f82417258bcde5fde88b7072ae3ce6953d05a1ae6ae6ee2d0745ddda2934","publicKey":"039f1d2e9c2daf662d095c412b2f1e2e1ec482725e895be70f62b8065689eeab80"},{"address":"Dz1PvaydyqZqkPWQG3MKKdB6qME33eWkKoRXGGwJHZxnpdD","derivationPath":"","curve":"SubSr25519","coin":"KUSAMA","network":"","segWit":"","extPubKey":"","publicKey":"3e4d1eb6f5ddcfe52aee60876466d61ac41767ea0c4d03f14576c558440f8b3b"},{"address":"12QgswWAsQ67XdaabCHJZX6Kos4dvgPUNShAHtzLNaNzE41L","derivationPath":"","curve":"SubSr25519","coin":"POLKADOT","network":"","segWit":"","extPubKey":"","publicKey":"3e4d1eb6f5ddcfe52aee60876466d61ac41767ea0c4d03f14576c558440f8b3b"},{"address":"f1zlkjwo5pnm6petm4u4luj6gb6e64eecrw4t4stq","derivationPath":"m/44'/461'/0'/0/0","curve":"SECP256k1","coin":"FILECOIN","network":"MAINNET","segWit":"","extPubKey":"0324e05fc480000000c470edcd1b8ef8b5f8529606ac8c0b3046b586b06a8b23d7e5a1c3719a4462030237fa250b159304b6d3eea0a020a2dc9d12deba4181483a240bcd007103f51346","publicKey":"028641b5af1a9074e5935b37c7d064838770386d5fc22b232251169db39125157c"},{"address":"tz1KuiVvqzqkUtrrrVVu193kESggDGafhnwq","derivationPath":"m/44'/1729'/0'/0'","curve":"ED25519","coin":"TEZOS","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"2ed22dc627b386b4c2f2444664c2b12a09271025c2984ee0c13fa39493dbc3e2"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703142306,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/d337b532-1ad9-4843-a5a0-b46d472f6410.json b/token-core/tcx-migration/tests/fixtures/android-2911/d337b532-1ad9-4843-a5a0-b46d472f6410.json
new file mode 100644
index 00000000..1f0a3274
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/d337b532-1ad9-4843-a5a0-b46d472f6410.json
@@ -0,0 +1 @@
+{"id":"d337b532-1ad9-4843-a5a0-b46d472f6410","version":11001,"keyHash":"53bd7bfcb980833dfcd37bcf70eae1c7baacf118","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"946c742623bdb1d8c7dc8b587f41123e"},"ciphertext":"4cbd604cb1985a7b75b1d223a8b2d86be3d8be3f3af122ec313253c0d87883b7","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"51deb4fb8a737af554b353f37e858ac4f8e31c8c3e5f47d1dd78a0c71b3c23dc"},"mac":"c2b7bf68ab2f3a3221b9d008c51a16a64047aebf5333fbc851ac99c27ec264b2"},"activeAccounts":[{"address":"tz1TQDPLKrhK3Y84AiK372Zg6v7b4sEwwHcM","derivationPath":"","curve":"ED25519","coin":"TEZOS","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"8fa2b65d2dde7a83f604095428201a988ca98d50dc3e9fa1c9b796938b300c60"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703146895,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/de518612-2d90-401a-aa5f-2add45f5acd0.json b/token-core/tcx-migration/tests/fixtures/android-2911/de518612-2d90-401a-aa5f-2add45f5acd0.json
new file mode 100644
index 00000000..a92f43ac
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/de518612-2d90-401a-aa5f-2add45f5acd0.json
@@ -0,0 +1 @@
+{"id":"de518612-2d90-401a-aa5f-2add45f5acd0","version":11000,"keyHash":"83028aff6a715cf87c934db0439e9c74f4d40db2","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"f1c94bad10fea08fb4036ff0d23a2dc1"},"ciphertext":"004a2827a822553a2812b528553d7fbff4ed2affef38dd9f7d9dfd6600814ba60eaa9f414464b86a4cf94c93dea1f506c7a3845f0b63405a8d7d733faf433052170e3748466ebc","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"1bb76d2b66602d5627380efc398e12d8d3c3c6d5fd365169482064c5a6f0da2d"},"mac":"0d762fb652340c7100e624e7fe316593f5d4df8845028aa6805af5d95da6bb3a"},"activeAccounts":[{"address":"LXFVBkEE8WXhC8FUyYAFZujbQNLT3Jwbhe","derivationPath":"m/44'/2'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"MAINNET","segWit":"NONE","extPubKey":"039b9a918d80000000e9067eeaf405db016ff01c55a3b8f059befe0a56f1e0b6de22cc6f8408f9c8cd0361e61aa0dcdb4bd68e91460210672b02972474ce1058555804acb61129424e5b","publicKey":"028225379426d50276bef3a00b10030f9b9e637386861328c07e6bd3920c62b94b"}],"imTokenMeta":{"name":"LTC","passwordHint":"","timestamp":1703147432,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/e3824175-14cd-4a09-b475-94dda9b3ec0e.json b/token-core/tcx-migration/tests/fixtures/android-2911/e3824175-14cd-4a09-b475-94dda9b3ec0e.json
new file mode 100644
index 00000000..adace54c
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/e3824175-14cd-4a09-b475-94dda9b3ec0e.json
@@ -0,0 +1 @@
+{"id":"e3824175-14cd-4a09-b475-94dda9b3ec0e","version":11001,"keyHash":"0e9384d5c14a81b55ae369867fc0c07b9ed705d6","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"463e07f68cde21b0f1ff2b8dc9963a36"},"ciphertext":"a95d258964072c92ceb4682494a8126c3742fb8a6493dff998ab4c4929a8469d","kdf":"pbkdf2","kdfparams":{"c":262144,"prf":"hmac-sha256","dklen":32,"salt":"34d007fde1850d78ece6277b584f7adfd6c3fc2441875ef3f392184e1102d961"},"mac":"72ebdd8e4e309f00a3a194358229c86ed5da5cbb53577541fca32d6466995227"},"activeAccounts":[{"address":"f1hry6bmxfakhwgjozseneeogg45o3zvfow75jxiq","derivationPath":"","curve":"SECP256k1","coin":"FILECOIN","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"038f5a128b45160b6a72362d3f3d6357a0cd1a0b7ecb6f09cd992e847cce457d27"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703146828,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/e8a54847-aa14-4fd2-8ddf-495371a47af2.json b/token-core/tcx-migration/tests/fixtures/android-2911/e8a54847-aa14-4fd2-8ddf-495371a47af2.json
new file mode 100644
index 00000000..36d7a068
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/e8a54847-aa14-4fd2-8ddf-495371a47af2.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"a448f129e5bc76a2d2aefa213ec8ba1f"},"ciphertext":"b55a52f77cce682ba86a792236c20ae6","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"2b99d4ea2b9f1f5f15fea543851f19e9e7d7a4c6ec38d653e8682d751260ff07"},"mac":"386f187761e06b0dfc032149fd7ce2fdddcdee18af7d0d2910d7710d83cd75f2"},"id":"e8a54847-aa14-4fd2-8ddf-495371a47af2","version":10001,"encMnemonic":{"encStr":"278fa8a32b419f06d3541a5bdf88a7d3c9c6015008b7e256e22dea7698261c797ee2ffb41dc803b32a762ae0333016a4b8b75641c6c4e1e7f724da55b4f5996e97ef621d218391ef97bfa054b956","nonce":"13c6a37639611938db92298204320be8"},"mnemonicPath":"m/44'/194'/0'/0/0","keyPathPrivates":[{"derivedMode":"HD_SHA256","encPrivate":{"encStr":"ff4997a2360e65257c34e689969006ec68d68bf7d2a5e51e926441b8d2812b08","nonce":"528d4eb0538f8cefa614f2dc7e4c0a80"},"path":"","publicKey":"EOS8cfqaYd9F6n2XoZYUudFtKMJhC9fT8JLmesFjAy3XSzp24bteC"},{"derivedMode":"HD_SHA256","encPrivate":{"encStr":"00b7e3d9f8f0ba4131d9a71b65cac22cfbbf5535121d9d5c1c8bbbd7bf7df46a","nonce":"485cca2a2ff3506ae1096e8fddaa1f2b"},"path":"","publicKey":"EOS5AKttsCPkaRJWHgrvXdrPjq2GBZLVZFG54LubRRtCZmpHseHDu"},{"derivedMode":"PATH_DIRECTLY","encPrivate":{"encStr":"b6e84265207dfe9c517412ea5ba4d89090dec739b88471031c4e792358d83ee0","nonce":"72026452ea06e01ca477324e5dd3a98b"},"path":"m/44'/194'/0'/0/0","publicKey":"EOS6u5yykZ6efm9imiYPBQPwkRV11u8tSTgUaGgHzz6K5Coz2V8of"}],"imTokenMeta":{"backup":[],"chainType":"EOS","mode":"NORMAL","name":"EOS","passwordHint":"","source":"RECOVERED_IDENTITY","timestamp":1703142308,"walletType":"HD"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/f5235fee-103f-4bed-8b35-465482da91cc.json b/token-core/tcx-migration/tests/fixtures/android-2911/f5235fee-103f-4bed-8b35-465482da91cc.json
new file mode 100644
index 00000000..a6cb8699
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/f5235fee-103f-4bed-8b35-465482da91cc.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"0d7648f3096d50493687911893e5243a"},"ciphertext":"3221ff3d174c0988ba9e4d76a12473b6fb9583bed4319a8f858bfd20ef2ac059","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"1ed6763a0aa409840d2cdebcfe27f2994dc1c0e5518c2c85879bea7509e3d724"},"mac":"c4994a140d37a5ab75f283df8304a4fc5cf4f9918bfd2c0dd89f3526a9a6d999"},"id":"f5235fee-103f-4bed-8b35-465482da91cc","version":3,"address":"9d30f9d302989ca1df6e4db8361fc2535997cfb7","encMnemonic":{"encStr":"90a12bb464e6fc2148d91c4f468facd75f7f76505e82553ed6a6b3d3cc47136b6737fe64645458dbed81cdde7284a0712965ab92baabce2b1c9d71f97e82ca08b8131c727786ff6dfc0dc816b516","nonce":"374f44e648ad8b74d58b8ecd2d4e56d8"},"mnemonicPath":"m/44'/60'/0'/0/0","imTokenMeta":{"backup":[],"chainType":"ETHEREUM","mode":"NORMAL","name":"ETH","passwordHint":"","source":"RECOVERED_IDENTITY","timestamp":1703142298,"walletType":"V3"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/android-2911/identity.json b/token-core/tcx-migration/tests/fixtures/android-2911/identity.json
new file mode 100644
index 00000000..a85553eb
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/android-2911/identity.json
@@ -0,0 +1 @@
+{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d296deedee56f973e90b17db14f01a28"},"ciphertext":"8facc9eeded1258fffda8d2ea68f684a257e94d9050b9e8582b17bd00a87d744730f4a0dd32489b5430283d5a838be508524a6a03e1b7e86f0ae863e279dab7e785816aff1e60cbfda1d4030f4ee4f5351ed8945d7959a5e4d40775e480b56521eeee4005284cf7974b33193483e3d","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"b8653383c3e93a8141b2b981a4c68e57ebdc36169c0618c8eaaa75d00dfca8e5"},"mac":"58c93d42ae62123abc0699999bdbe3fd90ac8f87a76713a3d8df9d4b7f1f6f00"},"id":"6c992a88-bbc1-4449-b08a-cd38926e0f79","version":10000,"encAuthKey":{"encStr":"ce1346c69259585fd4f222d7d8327a8b1bae019e41649b3d7c619f1f59283381","nonce":"e5bba1ab95ba759aa4fb077d44b14bed"},"encKey":"4c288aee68374d56858aaa3d99d9888fdd11fd5523d6266dcf9acc07fb120e24","encMnemonic":{"encStr":"0afb81e16bdbee092092f1e05ee30a50508c1e949f1d2088fecb20de4e0451ba48e458f8cd4f74889b11730be1b56b4146c8277a76e11b5aa1c5774a111b465a7bb71b471d2d64c0ce10358d411f","nonce":"7b669a4982036820d96b08175830c3a9"},"identifier":"im14x5Qxe7DUSZMvQ1gBjCQi1ghvdbrb5WuqpTZ","ipfsId":"Qmanvbdzaus3aMNZJNd21XqVq6cvJHnkSaUwYvM58qd4fw","walletIDs":["f5235fee-103f-4bed-8b35-465482da91cc","502bc8f1-4c4f-491e-8550-918c81389503","04f85091-cf07-4761-8149-19c8e7dd39c5","e8a54847-aa14-4fd2-8ddf-495371a47af2","7c5b41ce-2bee-4797-b795-8150979e6248","9c6c8a23-5026-4acd-b124-bc789766ae63","54cc1a75-12e3-41b7-b1cc-71a67a2d185a","85eb7383-ab01-4491-bfef-708b7ab63fcd","42688af7-ad87-42d2-ba2e-38d0d2d88c54","bea65809-2e16-46af-a2ab-21f034c149a8","aa1f67af-5237-43b8-af55-8e65b66deedc"],"imTokenMeta":{"backup":[],"mode":"NORMAL","name":"identity_name","network":"MAINNET","passwordHint":"","source":"RECOVERED_IDENTITY","timestamp":1703142298}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/b05a0ff9-885a-4a31-9d82-6477d34d1e37.json b/token-core/tcx-migration/tests/fixtures/b05a0ff9-885a-4a31-9d82-6477d34d1e37.json
new file mode 100644
index 00000000..8e6853d4
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/b05a0ff9-885a-4a31-9d82-6477d34d1e37.json
@@ -0,0 +1,35 @@
+{
+  "id": "b05a0ff9-885a-4a31-9d82-6477d34d1e37",
+  "version": 12000,
+  "fingerprint": "512115eca3ae86646aeb06861d551e403b543509",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "080d1850e994e9a8efab603c3b8e6258"
+    },
+    "ciphertext": "518f80dfd42d8cd90842d0849d3198d44d4e49cc1f7543a6e73a23c576ba4e3833b946676d97e574bf5a0201f15742740b287db4a7b0a9afb6678d966797249ace94c2c0d46187ae9657",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 262144,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "08c8c9ab072b92b2081db806d3f6309dc336a4a632b8a80a7e993ceca5aeaf34"
+    },
+    "mac": "200a54358c0eb0032396906b9280c5331280cafce4e826d9d66b0dd86e5dcb66"
+  },
+  "identity": {
+    "encAuthKey": {
+      "encStr": "00a4c73e5196d143842a0a26916e3c1fc1190e44580bfe62fcd85ee1eaf9a4e9",
+      "nonce": "afecf1dde1f383d81b03f149f67e0057"
+    },
+    "encKey": "ef806a542bcc30da7ce60fc37bd6cc91619b482f6f070af3a9d7b042087886f3",
+    "identifier": "im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf",
+    "ipfsId": "QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6"
+  },
+  "imTokenMeta": {
+    "name": "Unknown",
+    "passwordHint": "",
+    "timestamp": 1695733663,
+    "source": "MNEMONIC"
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/identity.json b/token-core/tcx-migration/tests/fixtures/identity.json
new file mode 100644
index 00000000..fcb36d05
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/identity.json
@@ -0,0 +1,43 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "76e228e45cc66228e1890dec1d211de6"
+    },
+    "ciphertext": "18ce44f304402417eb96f3468a4f49450cb4b6916c32522ae5173960db929f486ff373781f1fca4742ed853b6c2d7e6951533a68805ae7586befc7d830718a3d8e9074ea6cd5bb361a1b06cf3c2cf8b4d82755c6639816b3ec1727cdd0b5e45a144f5cf943177a30ee9ecee2a65314",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "519463106b45fcb3ffcb39b1b8805cdb3d789a908502ce5f3b976dbca780a2d0"
+    },
+    "mac": "359ea5fe92c0dce5ab03a31e354de1f33a9f7cb822f012d00da68bddc7b02c5d"
+  },
+  "id": "a1b92c23-5fcb-43a7-a8fe-07bb56acd033",
+  "version": 10000,
+  "encAuthKey": {
+    "encStr": "ba3afce29774e6225f6bd24df91fb911dc4583f8d999669912388ce461d49ac0",
+    "nonce": "b1ab60c19a5fc6568bef1eea30d38a98"
+  },
+  "encKey": "9513617c9b398edebfb46080a8f0cf6c",
+  "encMnemonic": {
+    "encStr": "01dfbda9bd529fda10233082e8bed9ea7b7acda60c7f676f9cc5a4cf7c6f65bd3426e5e3cfec27652d9e36f0f855dbd2f8f0693b79f82bece69cd291ec2979862a45b40e758f48336c41",
+    "nonce": "869c45b926817db6a842eec33acf846e"
+  },
+  "identifier": "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg",
+  "ipfsId": "QmVoPZQnQjppqcD4gUh1KrfmjbWQCtXQpm2YrFG6Voquh2",
+  "walletIDs": [
+    "175169f7-5a35-4df7-93c1-1ff612168e71",
+    "02a55ab6-554a-4e78-bc26-6a7acced7e5e",
+    "045861fe-0e9b-4069-92aa-0ac03cad55e0"
+  ],
+  "imTokenMeta": {
+    "backup": [],
+    "network": "MAINNET",
+    "name": "identity_name",
+    "passwordHint": "",
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": 1519611220
+  }
+}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/00fc0804-7cea-46d8-9e95-ed1efac65358 b/token-core/tcx-migration/tests/fixtures/ios-214/00fc0804-7cea-46d8-9e95-ed1efac65358
new file mode 100644
index 00000000..cab57d2b
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/00fc0804-7cea-46d8-9e95-ed1efac65358
@@ -0,0 +1,39 @@
+{
+  "address": "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB",
+  "imTokenMeta": {
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": "1703213076.948025",
+    "backup": [],
+    "mode": "normal",
+    "name": "BTC",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "BITCOIN",
+    "network": "TESTNET",
+    "segWit": "P2WPKH"
+  },
+  "id": "00fc0804-7cea-46d8-9e95-ed1efac65358",
+  "encMnemonic": {
+    "nonce": "406c972f073ebf5b9102d262e6713408",
+    "encStr": "76b940d06641023f995cffde6ee9c4bc7c063a780897b5debd619aafc769b37db684eafb10dd48c3c3cbcb810952bb4455984fde5aa34a1dfb4d5ad93293c0d3f3a78124639a4530b4c2"
+  },
+  "xpub": "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv",
+  "crypto": {
+    "kdfparams": {
+      "dklen": 32,
+      "r": 8,
+      "salt": "8fac63b4cc6d75817269a380bc8107572ecba3a8fe1ab87e46e30ab696ce2320",
+      "p": 1,
+      "n": 262144
+    },
+    "mac": "6daa39ee727416a135b02d6183c71624de0b7cf74fb3a3d1562488e66f308c76",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "cdde8cafd9eff3f9715ef40577913e2ded3b8a9f009781d3367e4a1b02e95894c45ab6ef2658e7ef99b8437cba0f05f5c12caca60e97745b71581075f086a57afac8f626f3d2f7c94813edb6eb26b5cf8147fd32419a3abc762d71dc2be77d555cb75e983a74fa45f7b08e59ce7945",
+    "cipherparams": {
+      "iv": "a575c61a89577eea45af32df6aa4005a"
+    },
+    "kdf": "scrypt"
+  },
+  "version": 44,
+  "mnemonicPath": "m/49'/1'/0'"
+}
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/0597526e-105f-425b-bb44-086fc9dc9568 b/token-core/tcx-migration/tests/fixtures/ios-214/0597526e-105f-425b-bb44-086fc9dc9568
new file mode 100644
index 00000000..870491d1
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/0597526e-105f-425b-bb44-086fc9dc9568
@@ -0,0 +1 @@
+{"address":"6031564e7b2f5cc33737807b2e58daff870b590b","encMnemonic":{"nonce":"2965662f34c72c81a88c1db2aca114b4","encStr":"ddd91dd4d10cf6baf95ca5feac29936e687d2053af23c286acfac9aecab28d27b9035b561da5c779fa46793ea04ea227f8021fba29588470324efbfece7bd32485285a26a847c17fa84c"},"id":"0597526e-105f-425b-bb44-086fc9dc9568","mnemonicPath":"m\/44'\/60'\/0'\/0\/0","imTokenMeta":{"name":"ETH","chain":"ETHEREUM","version":"iOS-2.14.1.1742","network":"MAINNET","backup":[],"segWit":"NONE","timestamp":"1703213075.42502","passwordHint":"","mode":"normal","source":"RECOVERED_IDENTITY"},"crypto":{"ciphertext":"17ab523c759dbcf3104dc3e3b69b8b2c7f188bf8379af98257d2fec06688402a","kdf":"scrypt","mac":"97f5ed556e84a95422de0d85ba17b71320c91d203b6a42214e151bcf40cdf0de","cipherparams":{"iv":"3a95e7bb685f2873efba577839ea8915"},"kdfparams":{"r":8,"dklen":32,"n":262144,"p":1,"salt":"4f84c01e3fdbaac75feff106bea17dde9d9f7cc3db05043664e958fe50f2ed05"},"cipher":"aes-128-ctr"},"version":3}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json b/token-core/tcx-migration/tests/fixtures/ios-214/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
new file mode 100644
index 00000000..701f9a53
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
@@ -0,0 +1 @@
+{"id":"0a2756cd-ff70-437b-9bdb-ad46b8bb0819","version":11000,"keyHash":"512115eca3ae86646aeb06861d551e403b543509","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"acc1209c400cfff80668e9a36ef8a2e5"},"ciphertext":"033964aa3253c904f50b3798a14299802765ddd84ffa7b699e24ee531076ab6256682a45c8f4c9a4c98f202e5791f5061833d3936fc9f12728d1658ea6bb49fac38e577861981a5e5d43","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"4fba99988c8eec256f138e1f5e098b03d91461b8969544878f315343f42d1e5f"},"mac":"d94cca35619e88fccdc6778b8c0c5691fe163378b02cf32ec3e6afbe0ce5ff05"},"activeAccounts":[{"address":"TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2","derivationPath":"m/44'/195'/0'/0/0","curve":"SECP256k1","coin":"TRON","network":"","segWit":"","extPubKey":"037e39800880000000988ebb67dc6f173948ccaed62dd3c4b60fea66a4280da93eed971b55d4e6e9c203349ff19e96c1aa7f568e493f85fa506320410245b4e69146bb0d3d8b5df3b901","publicKey":"037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5"},{"address":"ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6","derivationPath":"m/44'/309'/0'/0/0","curve":"SECP256k1","coin":"NERVOS","network":"TESTNET","segWit":"","extPubKey":"03b4fb97788000000048c75f39fe91ddfe4a0e6ef2fa53795a006e0e78f06b1af7d2b107ea3cefe22903ad9d0e2d9181e23c7075a56ed4f10e249aaf38a2bb7aa0cb604f8b768ea84b86","publicKey":"03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd"},{"address":"qqurlwqukz3lcujttcyvlzaagppnd4c37chrtrylmc","derivationPath":"m/44'/1'/0'/0/0","curve":"SECP256k1","coin":"BITCOINCASH","network":"TESTNET","segWit":"NONE","extPubKey":"036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020","publicKey":"033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4e"},{"address":"myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ","derivationPath":"m/44'/2'/0'/0/0","curve":"SECP256k1","coin":"LITECOIN","network":"TESTNET","segWit":"NONE","extPubKey":"03bd0b1c14800000003bd4b941a0eebb0bfa4c3324bb77f0a1643aa80d112e2a6d48187c1b333a3d2d02c7709248e6205fefa7366efb0269021f1f2f1e04fdc334fe7c7fd2628d7451e8","publicKey":"0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b"},{"address":"JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS","derivationPath":"","curve":"SubSr25519","coin":"KUSAMA","network":"","segWit":"","extPubKey":"","publicKey":"fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"},{"address":"16hsF1UW1kob7vUR7tymVNCmp1eo18uhhtc4szetH4xbYpbd","derivationPath":"","curve":"SubSr25519","coin":"POLKADOT","network":"","segWit":"","extPubKey":"","publicKey":"fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"},{"address":"t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey","derivationPath":"m/44'/461'/0'/0/0","curve":"SECP256k1","coin":"FILECOIN","network":"TESTNET","segWit":"","extPubKey":"03d2bab08e80000000b2045e43ef88287b28ca49251d4fdc5e2810b1340e7e1be6fe3f8e968c33e4fd02611325073f61ae5feb6c8dce96857d007cdb765937e53e43e6f91374dac62edb","publicKey":"03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785"},{"address":"tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz","derivationPath":"m/44'/1729'/0'/0'","curve":"ED25519","coin":"TEZOS","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703213098,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/300b42bc-0948-4734-82cb-4293dfeeefd2.json b/token-core/tcx-migration/tests/fixtures/ios-214/300b42bc-0948-4734-82cb-4293dfeeefd2.json
new file mode 100644
index 00000000..b415574f
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/300b42bc-0948-4734-82cb-4293dfeeefd2.json
@@ -0,0 +1 @@
+{"id":"300b42bc-0948-4734-82cb-4293dfeeefd2","version":11000,"keyHash":"dae3455556d5d8393bd6eab490f3fd826dea11d7","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"9d32a43c6b72fb2d2e4b2270710c8433"},"ciphertext":"53a7b92e1e298aacb3d8a2c60af33bf32859cee2d864f96f224a2efb0e6cb9424c692465e7f16ac10658ed4f77112b1d1e6d4f0c70a330ede4a328ed0988e29ff98597ac16bf7024ecd8","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"b75cf0eef6f8336496dd3ff6154ab722a48f257e0d722c279df44f59f50c4829"},"mac":"b7af11db0bc1017475cff76c66a8bd273d17ca8afc801cc455d8f6b5c04c09a2"},"activeAccounts":[{"address":"ckt1qyqgkffut7e7md39tp5ts9vxssj7wdw8z4cquyflka","derivationPath":"m/44'/309'/0'/0/0","curve":"SECP256k1","coin":"NERVOS","network":"TESTNET","segWit":"","extPubKey":"0388738aff800000002c2f44d1805be1ced7fc390a43385c492ba910f3423865d86ce16ea53689cd410371dcfc20fae2ed0020d5f4dc5ba5650b6a838fe3d0fc546c6a054ec54e8b46f6","publicKey":"0314ec66f9ba5135e15a6477cd0ac63b2ede974e085f5fb324f26b4bef8891da2c"}],"imTokenMeta":{"name":"Imported 6","passwordHint":"","timestamp":1703214731,"source":"MNEMONIC"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/46e8e653-dd05-4217-b225-faafc8451a2c.json b/token-core/tcx-migration/tests/fixtures/ios-214/46e8e653-dd05-4217-b225-faafc8451a2c.json
new file mode 100644
index 00000000..7c17a194
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/46e8e653-dd05-4217-b225-faafc8451a2c.json
@@ -0,0 +1 @@
+{"id":"46e8e653-dd05-4217-b225-faafc8451a2c","version":11001,"keyHash":"e74f1ec2f7d09b494c6679b24dc0379d0942084f","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"04e1ebd84e6f814197c98390321ebcd7"},"ciphertext":"e8a4e34c0d8295d8df53edaf786ed46327aafa8cb12454f69ffe12e3a749e904","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"0d091a3c11a9e65a641b7e9eb5d19b6dcf814a4baea8219f1c57ac7a3283ea0c"},"mac":"64c31149419ae08e3c3bcb0e0b8195c19398af21017a4bde285b5a3f115c203b"},"activeAccounts":[{"address":"LavE5eHDvw9VDiNifbraR7GyY8MRvcQSLQ","derivationPath":"","curve":"SECP256k1","coin":"LITECOIN","network":"MAINNET","segWit":"NONE","extPubKey":"","publicKey":"03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703226999,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/483cb13e-5e59-4428-a219-018de4ce60f6.json b/token-core/tcx-migration/tests/fixtures/ios-214/483cb13e-5e59-4428-a219-018de4ce60f6.json
new file mode 100644
index 00000000..cef3ba32
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/483cb13e-5e59-4428-a219-018de4ce60f6.json
@@ -0,0 +1 @@
+{"id":"483cb13e-5e59-4428-a219-018de4ce60f6","version":11001,"keyHash":"857768c6e939731056de55f93ac8dd084dfa7495","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"aa8a78aed3e97d248a4e3bf9b59e199b"},"ciphertext":"7718a2d0f422d519984e386c818a39f36cf0eb36175e3a899c5e4385fe51637f","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"3bb181ab7ef0e6a39d21852529a141789e48ff898e54178a69aa0bb9639ea601"},"mac":"c52c0f60943b8db9111e23e73e26f1dc699de10dbca65852510488925ed47546"},"activeAccounts":[{"address":"qpvtgl4r5h4mexvme0w59xunuzfnzkq585cj4skrp4","derivationPath":"","curve":"SECP256k1","coin":"BITCOINCASH","network":"MAINNET","segWit":"NONE","extPubKey":"","publicKey":"024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703226876,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json b/token-core/tcx-migration/tests/fixtures/ios-214/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json
new file mode 100644
index 00000000..b641000a
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json
@@ -0,0 +1 @@
+{"id":"4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca","version":11001,"keyHash":"4e6c074ea45b5fb91dedde3d0f2a98e4bacebad6","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"b861ccef945108ba4549144de514d5ae"},"ciphertext":"d6ab3a9f78cc610d2af5ea977531b958e3ca9d4b6d308591b9ac6c3b7b371d20","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"6581f8aeb6abf554444a2af18704628a1c49fdb5046a5ba7687d90445a166d4e"},"mac":"74c9ae251a8addc7a34332cfcedae390054148abc82127ce15279d418e634e53"},"activeAccounts":[{"address":"TC1nbfByaLWHvK8haEFTkMZJBNxsnKfqKh","derivationPath":"","curve":"SECP256k1","coin":"TRON","network":"","segWit":"","extPubKey":"","publicKey":"03f6a261f3b4d7c24014f2026b09ad409076c566b39b99b8e0a7196f391caec508"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703214638,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json b/token-core/tcx-migration/tests/fixtures/ios-214/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json
new file mode 100644
index 00000000..f061d7c2
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json
@@ -0,0 +1 @@
+{"id":"4d5cbfcf-aee1-4908-9991-9d060eb68a0e","version":11001,"keyHash":"3a9e72763fa0c09fe692054b9394d2f0855d99b6","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"bb7bd7ad553993efe60ad4d7eba02cc7"},"ciphertext":"e5d4efb36ef52b0b81934764072d010d05a90baa9e5927afc0f1342d49f570a2","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"aaeb5d3f08de7705e4879687804d620cd4d1ad6a6c66bdaf8b258ff3ed960d31"},"mac":"c8ad29fef073f40f8c46fd74e589f1de40365563830cc962bd630f626a815538"},"activeAccounts":[{"address":"tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz","derivationPath":"","curve":"ED25519","coin":"TEZOS","network":"MAINNET","segWit":"","extPubKey":"","publicKey":"bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703215567,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/60573d8d-8e83-45c3-85a5-34fbb2aad5e1 b/token-core/tcx-migration/tests/fixtures/ios-214/60573d8d-8e83-45c3-85a5-34fbb2aad5e1
new file mode 100644
index 00000000..0631fe6e
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/60573d8d-8e83-45c3-85a5-34fbb2aad5e1
@@ -0,0 +1 @@
+{"imTokenMeta":{"backup":[],"version":"iOS-2.14.1.1742","mode":"normal","source":"KEYSTORE","segWit":"NONE","name":"Imported 2","timestamp":"1703213710.762331","chain":"ETHEREUM","passwordHint":""},"id":"60573d8d-8e83-45c3-85a5-34fbb2aad5e1","version":3,"address":"02c98f4ed8c8aab1aaba46539e45070a02e416c0","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"21cca31acb4b3ec6824e7209f316d7ca"},"kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"375c44fe7e9f97e1890500dd57327e3ba622ef4af42fa95e0cb099d88d93de2a"},"kdf":"scrypt","ciphertext":"9b62a4c07c96ca9b0b82b5b5eae4e7c9b2b7db531a6d2991198eb6809a8c35ac","mac":"f14170589220a51692b64c859ce1e276b832208ea5816dfd37db0a1599b67ddc"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/6c20aab6-1596-456d-9749-212e6139c5ed b/token-core/tcx-migration/tests/fixtures/ios-214/6c20aab6-1596-456d-9749-212e6139c5ed
new file mode 100644
index 00000000..ce092885
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/6c20aab6-1596-456d-9749-212e6139c5ed
@@ -0,0 +1 @@
+{"xpub":"tpubDC8AkaytytTPrkUaPZpwL1NiRqr93MvGYHP75uQPMtyV9GXyB4hfJ4T7YU3RqXogUCHgvRn7EgePAogxhrPtser2KX3bN1YJBFRZVxhtGNV","mnemonicPath":"m\/49'\/1'\/0'","imTokenMeta":{"timestamp":"1703214806.924619","name":"Imported 7","segWit":"P2WPKH","backup":[],"version":"iOS-2.14.1.1742","chain":"BITCOIN","source":"MNEMONIC","network":"TESTNET","passwordHint":"","mode":"normal"},"address":"2ND3WGu69ULLWJ3XcmtLyGswSUdbycFjngN","crypto":{"ciphertext":"a86f985a707d2871d6802027f5cf943e1b66f99ebbb007032c95f721af4e531ed365fb705e15263bcce6aaec68bafc4a46c2f4bc8e83ab24946e6c645425f0743747f47792f55e0c1df573987c0a9d791bf5b95c5265e6bd99c353804c81f3658518bf7d034c1a15aa77435b8a6c95","kdfparams":{"n":262144,"r":8,"dklen":32,"salt":"6c528887c1a3a856c40bb3f87c7ca0091bcfbe01635ab69137554e0c54dcad42","p":1},"mac":"a3f9c6f3cf0588dd335d0db6d5e00d8ca0a1942ceb1d31af2c1b94db7b05c28e","kdf":"scrypt","cipher":"aes-128-ctr","cipherparams":{"iv":"20f16d3a33fbe4abdcb1bcb0f839fcb4"}},"encMnemonic":{"nonce":"1ec1cbae4075893940fdad972870bd24","encStr":"dc53ccd9eadce8fac95f9f8551d5563609d5318687f3c24cf17eafa46976d18759f40044780d6f3e51126d13475b60b7868bb97183f73cb2fe97e9182aee6a7163540aa520ea8f0debec"},"version":44,"id":"6c20aab6-1596-456d-9749-212e6139c5ed"}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/6c3eae60-ad03-48db-a5e5-61a6f72aef8d b/token-core/tcx-migration/tests/fixtures/ios-214/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
new file mode 100644
index 00000000..3f086a2f
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
@@ -0,0 +1,67 @@
+{
+  "encMnemonic": {
+    "encStr": "476ee81e62675ffb5e727f8e3f15f0222ff084bd4b064089d7a8397efe10bde265d965b214171f9e946128c7855cf53866b753021f6df8bd49b92bdb2caed5b8f618667177eaa5594933",
+    "nonce": "b553ebb7521eb1a9aa7d8738811ab102"
+  },
+  "keyPathPrivates": [
+    {
+      "derivedMode": "HD_SHA256",
+      "path": "",
+      "publicKey": "EOS7tpXQ1thFJ69ZXDqqEan7GMmuWdcptKmwgbs7n1cnx3hWPw3jw",
+      "privateKey": {
+        "encStr": "e44fc17b5bedd1f3409c07c84067f4d8af051b6edf72bfda4a4306f00f87cbde",
+        "nonce": "5485ffc4230fa0d389dde221ec22a0e2"
+      }
+    },
+    {
+      "privateKey": {
+        "encStr": "4267397725dda86d8a45079d7246fac0784c75494308cd8f5c5f157d74ce3a65",
+        "nonce": "d2f0a53208b5ddbda3e3c1808e92c64c"
+      },
+      "derivedMode": "HD_SHA256",
+      "publicKey": "EOS5SxZMjhKiXsmjxac8HBx56wWdZV1sCLZESh3ys1rzbMn4FUumU",
+      "path": ""
+    },
+    {
+      "privateKey": {
+        "nonce": "dae366211338af8bcc01610b0358b78e",
+        "encStr": "622c4a67b70c3e1fb33653dc56dc961cd8b4185252f31dceebab15a98e77f361"
+      },
+      "publicKey": "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+      "path": "m/44'/194'/0'/0/0",
+      "derivedMode": "PATH_DIRECTLY"
+    }
+  ],
+  "mnemonicPath": "m/44'/194'/0'/0/0",
+  "id": "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+  "version": 10001,
+  "crypto": {
+    "kdf": "scrypt",
+    "kdfparams": {
+      "salt": "43800be9d3459b3ce9b61826555165d5706a2e8ecfceb9e4b1fa341d743f5e60",
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "p": 1
+    },
+    "mac": "50a4fdbb20dc1a860ac93134e9edf15267f9f1a2443c4a329841bc17553758a9",
+    "cipherparams": {
+      "iv": "ac19624cfcb3cd32bd092ddf73aa6157"
+    },
+    "ciphertext": "7cd696ce21680fb9b02c326ec0563b05",
+    "cipher": "aes-128-ctr"
+  },
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "segWit": "NONE",
+    "mode": "normal",
+    "backup": [],
+    "timestamp": "1703213102.143412",
+    "source": "RECOVERED_IDENTITY",
+    "name": "EOS",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "EOS"
+  },
+  "address": ""
+}
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/792a0051-16d7-44a7-921a-9b4a0c893b8f b/token-core/tcx-migration/tests/fixtures/ios-214/792a0051-16d7-44a7-921a-9b4a0c893b8f
new file mode 100644
index 00000000..ab4c328f
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/792a0051-16d7-44a7-921a-9b4a0c893b8f
@@ -0,0 +1 @@
+{"id":"792a0051-16d7-44a7-921a-9b4a0c893b8f","mnemonicPath":"m\/44'\/60'\/0'\/0\/1","encMnemonic":{"nonce":"27d0fbb70bd03ce0e96824c0f88bb6ad","encStr":"b8e34c4ff5ee92f80cd893244c89be1ad75614550b4fde40eb81a214c4676623ec5f92076f495dc3204ab06533cccabbb218b01fbaa47255b56d7c17543aa3462d2f246169fb3377e422"},"imTokenMeta":{"source":"MNEMONIC","passwordHint":"","backup":[],"chain":"ETHEREUM","mode":"normal","network":"TESTNET","segWit":"NONE","version":"iOS-2.14.1.1742","timestamp":"1703217176.7788029","name":"Imported 12"},"crypto":{"cipher":"aes-128-ctr","kdf":"scrypt","ciphertext":"a3f81f417cf96399c178fd18c058cf0cdc1023116e293c3c6fe5aa8a58f972f9","mac":"42f62a4647194f4efe78a07e8517ef9f4974b4bfb71524ed8dc8282f36780ce5","kdfparams":{"salt":"59663950940345f9e69183f11f74319db35646ae7cd5be2f9f9bc478c07b4f1e","n":262144,"dklen":32,"r":8,"p":1},"cipherparams":{"iv":"4f64c9458e04b387dad5c7d0eaab8c91"}},"address":"7152bcad819b084d57179e293d2765ffa0109e04","version":3}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/949bada8-776c-4554-ad0c-001e3726a0f8.json b/token-core/tcx-migration/tests/fixtures/ios-214/949bada8-776c-4554-ad0c-001e3726a0f8.json
new file mode 100644
index 00000000..1995762d
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/949bada8-776c-4554-ad0c-001e3726a0f8.json
@@ -0,0 +1 @@
+{"id":"949bada8-776c-4554-ad0c-001e3726a0f8","version":11001,"keyHash":"53753cac330199ee8781a98ea425c4e3269fafb3","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"7be4c9889632aa4606629b8a4ac9ea3a"},"ciphertext":"7577539a2457fb55203efb4dd876d048b4e60c087ec256836b1a37665a93869e47c178c7d65a3adf298405968eb98335e81f9d34480890a23a3750688ba2c6a9","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"0dc1086c96903786a838cb107bd4c726dd5d2e84527eadf73810c7ca846c1ef1"},"mac":"39df9379fd9711cb674fa7db48d5d7e451e0e9910b94bdd437f05a24684f180a"},"activeAccounts":[{"address":"FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8","derivationPath":"","curve":"SubSr25519","coin":"KUSAMA","network":"","segWit":"","extPubKey":"","publicKey":"74c6c052c7c31523e52d3f7f810d2549eff08921f98f207815ef49fb94758157"}],"imTokenMeta":{"name":"test account","passwordHint":"","timestamp":1703215112,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/9b696367-69c1-4cfe-8325-e5530399fc3f b/token-core/tcx-migration/tests/fixtures/ios-214/9b696367-69c1-4cfe-8325-e5530399fc3f
new file mode 100644
index 00000000..4377c0ac
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/9b696367-69c1-4cfe-8325-e5530399fc3f
@@ -0,0 +1 @@
+{"encMnemonic":{"nonce":"2008d58e51c5404c3c40b9356367b4aa","encStr":"15f43fbbcedea68eed7366c97978590c4c967c241eccf04ec262037c19e5b674da17af29ccb3c1a20d8ee329f093664f6946a3a4c7a7d14dba6ac57d6ba8930c541397ed1726ba1bb1ce"},"crypto":{"kdfparams":{"r":8,"dklen":32,"n":262144,"salt":"baa68d0f96f49b047c284534d840950ceb819f84b88c5a416b4d5b9ea17f5aa8","p":1},"kdf":"scrypt","cipher":"aes-128-ctr","ciphertext":"4f0e3646ec292b97862ef9d3591266d40afe2d262478a50da4fc101e8063cac8","mac":"8e8b0cd5f92eee4934bbdc9ff14be7800f9a612e34bb8e6a868ece82485a35d1","cipherparams":{"iv":"30845f11343a0cde4c4d51f46d700f24"}},"imTokenMeta":{"version":"iOS-2.14.1.1742","name":"Imported 4","source":"MNEMONIC","chain":"COSMOS","network":"TESTNET","segWit":"NONE","timestamp":"1703214474.4959989","passwordHint":"","mode":"normal","backup":[]},"mnemonicPath":"m\/44'\/118'\/0'\/0\/0","address":"cosmos1m566v5rcklnac8vc0dftfu4lnvznhlu7d3f404","version":3,"id":"9b696367-69c1-4cfe-8325-e5530399fc3f"}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3 b/token-core/tcx-migration/tests/fixtures/ios-214/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3
new file mode 100644
index 00000000..1c99dd68
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3
@@ -0,0 +1 @@
+{"mnemonicPath":"m\/44'\/1'\/0'","encMnemonic":{"nonce":"2ee95dd0261dec2a1a169711fc6b122b","encStr":"5a67693dbeff1c5fe5dc8a4452971ab6716ae7c6b228408611492e61fa743a925b85f27de9bb2060fb7399d406c83974e408ac2a727cda382ea62b8686cd80bbc551e320ba2e8581edd0"},"xpub":"tpubDDLWiBeq9RLDQinYZUJueQBmT4bnY6Tbcsijqb4FgC7ZFifnt3ioiQRvuokYQTqBbLxxpYspFFgS1TAoXxdFBbzhkGFNdKaCRfcXK4sGxcC","version":44,"id":"9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3","imTokenMeta":{"mode":"normal","network":"TESTNET","name":"Imported 3","version":"iOS-2.14.1.1742","timestamp":"1703213844.307544","source":"MNEMONIC","passwordHint":"","backup":[],"segWit":"NONE","chain":"BITCOIN"},"address":"myRzNZ88RxzC14V8RDunAP3cx7dyXBFqmA","crypto":{"kdf":"scrypt","kdfparams":{"n":262144,"salt":"0514aba594970e5fe70a169f0710fbb1d34cddae600bc4c6920fcfa95bc0e9b2","r":8,"p":1,"dklen":32},"cipher":"aes-128-ctr","cipherparams":{"iv":"6de42c00f0a943bbfd8ac38381538268"},"mac":"97f8618e31d6c5e5cd38df78f98466790e44fa7026c077cf6ff60336007b4a80","ciphertext":"ce067661784ead67f410e26b1fde72012cd2f3db62723597b3a32ffe5075d68ed19bef458f89165b9404be1651a6ecdf87def7455982504e4e9b26901589cde2fdc2c3e55a3e3b0d414ec1dc37f9f9db8b2d2e5704a3f20a25dd08066f94c20ddc670ece8d5f49fa57d877844eed6a"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/9f4acb4a-7431-4c7d-bd25-a19656a86ea0 b/token-core/tcx-migration/tests/fixtures/ios-214/9f4acb4a-7431-4c7d-bd25-a19656a86ea0
new file mode 100644
index 00000000..08bc53e0
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/9f4acb4a-7431-4c7d-bd25-a19656a86ea0
@@ -0,0 +1 @@
+{"address":"3PwFUt9EgTkXzJh4cMoQroJZsVSf3w65mN","id":"9f4acb4a-7431-4c7d-bd25-a19656a86ea0","crypto":{"cipherparams":{"iv":"547e736a7696c1d5042f2a326448dcad"},"cipher":"aes-128-ctr","ciphertext":"177f8e5b38357562e363c93a5a724233b35271f34c102bb3bab11ce95b93464eff03e3a5b8339e5b1a0547d1a88373886b1f5763","kdf":"scrypt","mac":"965e49c4bdacfd3d82a9ddba7444980983a1d4bb2a3df473a2ed07207385b656","kdfparams":{"dklen":32,"n":262144,"r":8,"p":1,"salt":"07722d61dd3a5973edec8b20b0cb8c88685f26784f7cb2608a3f6d9528b7a6b9"}},"imTokenMeta":{"name":"Imported 13","network":"MAINNET","passwordHint":"","source":"WIF","timestamp":"1703226722.868754","version":"iOS-2.14.1.1742","mode":"normal","backup":[],"chain":"BITCOIN","segWit":"P2WPKH"},"version":3}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/a7294912-b24f-44ba-86c1-48d76117808a.json b/token-core/tcx-migration/tests/fixtures/ios-214/a7294912-b24f-44ba-86c1-48d76117808a.json
new file mode 100644
index 00000000..4d3d1229
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/a7294912-b24f-44ba-86c1-48d76117808a.json
@@ -0,0 +1 @@
+{"id":"a7294912-b24f-44ba-86c1-48d76117808a","version":11001,"keyHash":"4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"ac82e8975bca06eaeb5932db660909f3"},"ciphertext":"7a703585ece09a10aa033b5f86d499f8b315d021a751ff32ff916f7b462d6299","kdf":"pbkdf2","kdfparams":{"c":1024,"prf":"hmac-sha256","dklen":32,"salt":"a56738f29a6c41334e6a6d77dd45a80166bfc2b3799081e747303e7f6575b759"},"mac":"5d3ecd2a523ebca45e86cc935a81cb86e148e422bc5c53cb9e02664e56418900"},"activeAccounts":[{"address":"t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i","derivationPath":"","curve":"SECP256k1","coin":"FILECOIN","network":"TESTNET","segWit":"","extPubKey":"","publicKey":"02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba"}],"imTokenMeta":{"name":"","passwordHint":"","timestamp":1703215494,"source":"PRIVATE"}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/ac59ccc1-285b-47a7-92f5-a6c432cee21a b/token-core/tcx-migration/tests/fixtures/ios-214/ac59ccc1-285b-47a7-92f5-a6c432cee21a
new file mode 100644
index 00000000..cd4c8d33
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/ac59ccc1-285b-47a7-92f5-a6c432cee21a
@@ -0,0 +1 @@
+{"address":"cosmos1ajz9y0x3wekez7tz2td2j6l2dftn28v26dd992","imTokenMeta":{"network":"MAINNET","timestamp":"1703213078.483429","passwordHint":"","mode":"normal","name":"COSMOS","chain":"COSMOS","segWit":"NONE","backup":[],"version":"iOS-2.14.1.1742","source":"RECOVERED_IDENTITY"},"encMnemonic":{"encStr":"c8e9fd75dc1a95c7130e30bfbde8a384fe0fc91693cec3aff2529b93a7696cf3b22745f8de96cabbfc63ec31c33cd2de8ce2ec96870dd383d7e13f131272e7a3c358eeb46a36538b0720","nonce":"15da4b89ec152eb85702e0f596058f52"},"id":"ac59ccc1-285b-47a7-92f5-a6c432cee21a","crypto":{"kdfparams":{"p":1,"dklen":32,"n":262144,"r":8,"salt":"14599065a6ad64c42670524f136f4ceacdf72bb7e1b253e2ed56cb4f96e991be"},"cipher":"aes-128-ctr","cipherparams":{"iv":"c029f75712fd6555cd0b30bfa2644454"},"kdf":"scrypt","ciphertext":"d8bfd56edf4b7270a98ab71c48e0f6ae7f9897859740cfcd57fe4e2415629e62","mac":"4faea2527d04bfc9edc302875923deadf61113e849b36dfad8ad18d34eb38c63"},"mnemonicPath":"m\/44'\/118'\/0'\/0\/0","version":3}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/d9e3bb9c-87fd-4836-b146-10a3e249eb75 b/token-core/tcx-migration/tests/fixtures/ios-214/d9e3bb9c-87fd-4836-b146-10a3e249eb75
new file mode 100644
index 00000000..f4027d94
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/d9e3bb9c-87fd-4836-b146-10a3e249eb75
@@ -0,0 +1 @@
+{"version":3,"imTokenMeta":{"network":"MAINNET","name":"Imported 14","version":"iOS-2.14.1.1742","source":"WIF","passwordHint":"","timestamp":"1703226797.333446","backup":[],"chain":"BITCOIN","segWit":"NONE","mode":"normal"},"id":"d9e3bb9c-87fd-4836-b146-10a3e249eb75","address":"1962gsZ8PoPUYHneFakkCTrukdFMVQ4i4T","crypto":{"cipherparams":{"iv":"15f5b149172c5f96fc4eb4c2c618b9fe"},"ciphertext":"4a916ea2fbf9156f1f179ac94dc5f99ba2ed7b9d7841fb9e4271af38fdac9d349368e89c929604ce6987077a7d12e451842513dd","kdf":"scrypt","cipher":"aes-128-ctr","mac":"2061aad7f9165828873e04c7db581d5d60c36eba328940b18cc589a6df6095a2","kdfparams":{"n":262144,"r":8,"dklen":32,"p":1,"salt":"4db39bbbfed6027055eaaa0b92ea4c97b2476f368f70ec8f93a6be3a5cfb2747"}}}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/f3615a56-cb03-4aa4-a893-89944e49920d b/token-core/tcx-migration/tests/fixtures/ios-214/f3615a56-cb03-4aa4-a893-89944e49920d
new file mode 100644
index 00000000..cabe76d0
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/f3615a56-cb03-4aa4-a893-89944e49920d
@@ -0,0 +1 @@
+{"version":3,"imTokenMeta":{"name":"Imported 1","backup":[],"passwordHint":"","source":"PRIVATE","timestamp":"1703213241.0374532","version":"iOS-2.14.1.1742","mode":"normal","network":"TESTNET","segWit":"NONE","chain":"ETHEREUM"},"id":"f3615a56-cb03-4aa4-a893-89944e49920d","crypto":{"kdf":"scrypt","ciphertext":"bd9ed0988742c678f6b1a6a05233c08a00f438b2c62ff2f024abe32527886e3b","mac":"a606524699adc9419400e18440e1b13e3b727263f13548846ba1a0d6025c2124","cipher":"aes-128-ctr","cipherparams":{"iv":"e173367006b5bf571351d0f1b2aad303"},"kdfparams":{"dklen":32,"n":262144,"r":8,"p":1,"salt":"152db1481a9478809729a18236cd85068bbaa32a02da5495500993fd0d871ea2"}},"address":"80427ae1f55bcf60ee4cd2db7549b8bc69a74303"}
\ No newline at end of file
diff --git a/token-core/tcx-migration/tests/fixtures/ios-214/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json b/token-core/tcx-migration/tests/fixtures/ios-214/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json
new file mode 100644
index 00000000..7fafac49
--- /dev/null
+++ b/token-core/tcx-migration/tests/fixtures/ios-214/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json
@@ -0,0 +1,36 @@
+{
+  "id": "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb",
+  "version": 11001,
+  "keyHash": "e0d650a880f2cbbd8302483a06939cd3431592d8",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "6d9df1458a23ac4408aae9fa5b643210" },
+    "ciphertext": "4ad73446865c2e3d192378c2eabac647a48843ec4f553357b5533933752c06e8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "cacea0da408ce9d6f70a909602c23c87eb970490ccc4e06d7d80b4cf5ad67287"
+    },
+    "mac": "0dac456a4572a859e2dacc378435c401e2f1dddaa3191154b8f5f775f498a709"
+  },
+  "activeAccounts": [
+    {
+      "address": "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa",
+      "derivationPath": "",
+      "curve": "BLS",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "80f0d9dfb26b6c66254fd6663f4cbe39c4ca46e54f779c2e30c618fb57350e5b7f55b51c16e04c9d2550f3b731551ed7"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215416,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/tcx-migration/tests/migrate_test.rs b/token-core/tcx-migration/tests/migrate_test.rs
new file mode 100644
index 00000000..dc46382d
--- /dev/null
+++ b/token-core/tcx-migration/tests/migrate_test.rs
@@ -0,0 +1,393 @@
+#[cfg(test)]
+mod tests {
+    use serde_json::Value;
+    use tcx_constants::TEST_PASSWORD;
+    use tcx_crypto::Key;
+    use tcx_keystore::keystore::IdentityNetwork;
+    use tcx_keystore::Source;
+    use tcx_migration::keystore_upgrade::KeystoreUpgrade;
+    use tcx_migration::migration::LegacyKeystore;
+
+    #[test]
+    fn test_migrate_from_old_app() {
+        let tests = [
+            (
+                include_str!("./fixtures/ios-214/00fc0804-7cea-46d8-9e95-ed1efac65358"),
+                "2d7380db28736ae5b0693340a5731e137759d32bbcc1f7988574bc5a1ffd97f3411b4edc14ea648fa17d511129e81a84d2b8a00d45bc37f4784e49b641d5c3be",
+                Source::Mnemonic,
+                "BTC",
+                "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+            ),
+            (
+                include_str!("./fixtures/ios-214/0597526e-105f-425b-bb44-086fc9dc9568"),
+                "ee95c730e4638cede7c74b2576c1c0f5011860ab384637a1c5d0eb81394b3505474984934b164b3767eb093b16edcfd86f9822606f58166188b8fe9013c10741",
+                Source::Mnemonic,
+                "ETH",
+                "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+            ),
+            (
+                include_str!("./fixtures/ios-214/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json"),
+                "30d3639d4d1a52a8a3993712c1b1393129da06560dc7063e1d1132a155e6f701da4b7b7e3e10d648c49af3b34aed66771dec3b8387037a299e7bb6e7ae506633",
+                Source::Mnemonic,
+                "",
+                "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+            ),
+            (
+                include_str!("./fixtures/ios-214/300b42bc-0948-4734-82cb-4293dfeeefd2.json"),
+                "34140a19bb7fe72866da4c57a03934b0ccf543c7a5caca06a1c323013dcecc034e0ae750f9742513b66bd8acccc37b72ec77a95ff1b5232c6f1473fc35a0508c",
+                Source::Mnemonic,
+                "Imported 6",
+                "calm release clay imitate top extend close draw quiz refuse shuffle injury",
+            ),
+            (
+                include_str!("./fixtures/ios-214/46e8e653-dd05-4217-b225-faafc8451a2c.json"),
+                "2e70651f06a28d2f6053a90ee55ab8cb14518ab82182cd922926b4239713286ac6746ad4448608fc1599e6f4e0af33c65f70bc5de13a376933e5e145681d0f80",
+                Source::Private,
+                "",
+                "f9b3659f7246722270becdf9e67094b03e98a4a166a7299f0377bf735b501713",
+            ),
+            (
+                include_str!("./fixtures/ios-214/483cb13e-5e59-4428-a219-018de4ce60f6.json"),
+                "d175dad756f59a59b6a311f2b369802537d92011c8e3bf6dc2dfaf8df00d942648bf83133bd0204ebc43efcbd0ab79a8d5551c8dcf7ae1f67fc2d1d4aff33c06",
+                Source::Private,
+                "",
+                "8d3730ce79d9e0e829d480d88b29e8507755c282549dd80f6c0633804663a80a",
+            ),
+            (
+                include_str!("./fixtures/ios-214/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json"),
+                "1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017",
+                Source::Private,
+                "",
+                "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171",
+            ),
+            (
+                include_str!("./fixtures/ios-214/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json"),
+                "b009d3c4e961411836028a9fffbea994e03c71f75589a571cd52125884537f2ac165b92e7bc49c7828d4be0c5c05263a306744f0b9dc785142c8562d45ce4345",
+                Source::Private,
+                "",
+                "c0b5db8581dab39e23ec34fed0662cfbafd8fdfcb90a041f4fdef9d2be098da3",
+            ),
+            (
+                include_str!("./fixtures/ios-214/60573d8d-8e83-45c3-85a5-34fbb2aad5e1"),
+                "8f2316895af6d58b5b75d424977cdaeae2a619c6b941ca5f77dcfed592cd3b23b698040caf397df6153db6f2d5b2815bf8f8cd32f99998ca46534242df82d1ca",
+                Source::KeystoreV3,
+                "Imported 2",
+                "7e480e9ef0faccdf1a3aa773682742e099620f6177e95a878c2a612a0785fc7c",
+            ),
+            (
+                include_str!("./fixtures/ios-214/6c20aab6-1596-456d-9749-212e6139c5ed"),
+                "8c4900e4e629a026af957d2432a4aacf6ea29a6da6e930a05b68e6b001990457351e03546805082cfd2aca196a0448817fb5d8ff73b4f27a093af256a52ca1f6",
+                Source::Mnemonic,
+                "Imported 7",
+                "calm release clay imitate top extend close draw quiz refuse shuffle injury",
+            ),
+            (
+                include_str!("./fixtures/ios-214/6c3eae60-ad03-48db-a5e5-61a6f72aef8d"),
+                "9f65c31b4a61c430cd6c976e7f1b1b912bb09b46ec718447bbb5dccc353b19becb6b386405b3fcc7d43bd8e617764c3407d45824e52984d0074ac3f75c68bd92",
+                Source::Mnemonic,
+                "EOS",
+                "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+            ),
+            (
+                include_str!("./fixtures/ios-214/792a0051-16d7-44a7-921a-9b4a0c893b8f"),
+                "ebe2739dd04525823b967b914a74a5dedd0086622d0da3449c1354199518673dd33fca8f6bd64870d6e6dc28b0f6e9de169243679b1668750f23cfe9523c03b3",
+                Source::Mnemonic,
+                "Imported 12",
+                "calm release clay imitate top extend close draw quiz refuse shuffle injury",
+            ),
+            (
+                include_str!("./fixtures/ios-214/949bada8-776c-4554-ad0c-001e3726a0f8.json"),
+                TEST_PASSWORD,
+                Source::SubstrateKeystore,
+                "test account",
+                "70e74176bfe0e2ae30f75653ab075deee9dae54437cb249e311ca7fef495f34b7351a3f69c82513bcd0c91ca16c99ca116cf87be91683baecab352a9be69f693",
+            ),
+            (
+                include_str!("./fixtures/ios-214/9b696367-69c1-4cfe-8325-e5530399fc3f"),
+                "89afe9331bdc5b8239f31d8dbed1699da290c44b2220eb4735c54171db664f2f09f1b0fdd5182e2bbd85ef10d5507a5f31d8a2f553666cb3024745f79cd83de5",
+                Source::Mnemonic,
+                "Imported 4",
+                "calm release clay imitate top extend close draw quiz refuse shuffle injury",
+            ),
+            (
+                include_str!("./fixtures/ios-214/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3"),
+                "8a98b183cc42331a6bb3a585e7808c376e21e625b0c82dc245e04c3333a123ad1cf022319a21af31ca371cbc3d713b738792f82b84db3978b3e1a6cdeee019fb",
+                Source::Mnemonic,
+                "Imported 3",
+                "calm release clay imitate top extend close draw quiz refuse shuffle injury",
+            ),
+            (
+                include_str!("./fixtures/ios-214/9f4acb4a-7431-4c7d-bd25-a19656a86ea0"),
+                "a5b0cb9cb0536d6ec6ab21da77415bd59aff62c44c1da40d377c4faf2a44608693a72efb4079f57a5dca710ecff75dc5b54beb4ad6d9f9d47b63583810b50c61",
+                Source::Wif,
+                "Imported 13",
+                "8d3730ce79d9e0e829d480d88b29e8507755c282549dd80f6c0633804663a80a",
+            ),
+            (
+                include_str!("./fixtures/ios-214/a7294912-b24f-44ba-86c1-48d76117808a.json"),
+                "bee56a3cc9e6536dd22a695742ff1b4a00a797fa6c0ddd6f2c3bfd2ec25d05d61918ab3ceaf5c135f771d957889ee2b361c5d70f1911cc8857299d349a0d9ee6",
+                Source::Private,
+                "",
+                "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
+            ),
+            (
+                include_str!("./fixtures/ios-214/ac59ccc1-285b-47a7-92f5-a6c432cee21a"),
+                "4d9f1005a3e826d6f740c81676acf37d397f99354f3afdbe09b6ac02c93e3fb6a259063fa1ac3c89a79d84237d1d5ffe3b78ddb37abd6bd5b6811a9745bb7967",
+                Source::Mnemonic,
+                "COSMOS",
+                "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+            ),
+            (
+                include_str!("./fixtures/ios-214/d9e3bb9c-87fd-4836-b146-10a3e249eb75"),
+                "01073f22079380d2180300c518f6b510d4761fd83ce738271460c9e745b9055dabb28f93ff3a8fd54e0c71c005b5e799f8d52bcce1a81e08b5f15f9604531574",
+                Source::Wif,
+                "Imported 14",
+                "8d3730ce79d9e0e829d480d88b29e8507755c282549dd80f6c0633804663a80a",
+            ),
+            (
+                include_str!("./fixtures/ios-214/f3615a56-cb03-4aa4-a893-89944e49920d"),
+                "79c74b67fc73a255bc66afc1e7c25867a19e6d2afa5b8e3107a472de13201f1924fed05e811e7f5a4c3e72a8a6e047a80393c215412bde239ec7ded520896630",
+                Source::Private,
+                "Imported 1",
+                "4b8e7a47497d810cd11f209b8ce9d3b0eec34e85dc8bad5d12cb602425dd3d6b",
+            ),
+            (
+                include_str!("./fixtures/ios-214/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json"),
+                "f3207a9f25adbdae5eff58bb13a9d9be4d763c6d47269fb14e4bd7a59ed667ba7282f1ba40746c60ae842c3f9dfeba91060f29f547ef2a94a66cfee93573ffaa",
+                Source::Private,
+                "",
+                "8bb90efb3c5ce904bebfb63281c994621ecc5184917ace9a9e28222e1285f34f",
+            ),
+            (
+                include_str!("./fixtures/android-2911/04f85091-cf07-4761-8149-19c8e7dd39c5.json"),
+                "cba27920687a7022e4ad05be168216446e0bed96ab281f682af5ecfb4b34a746f4575b6f3416db0aac14f0f1830fd0bc4e239a5033234b831e9928c1ae6115ce",
+                Source::Mnemonic,
+                "Cosmos",
+                "segment need pole intact network hope level donkey machine razor advice silent",
+            ),
+            (
+                include_str!("./fixtures/android-2911/5e870760-0e65-4e2c-a56b-f57c340cfc49.json"),
+                "12341234",
+                Source::SubstrateKeystore,
+                "ksmaccount",
+                "40b241ebd06c214ae6d0df24d889b25bf0506d12aa0d756eb7be050233542c50ffe8721c5955d24a25133d0f60906283a8fab3eb6d0b78c9d59b29ff7b9b159b",
+            ),
+            (
+                include_str!("./fixtures/android-2911/7c3db9bb-b714-4698-a1a3-64473dce6841.json"),
+                "33dd510b32e8e591be3efc4a05fb5bcaefe4a66dc1cb95372e73ecd2d814fa232fab00ac6bcae1a51bec610e016e243ad98eb37c5dd543b72a14bf2ffdf6f448",
+                Source::Mnemonic,
+                "TRX",
+                "crazy appear check gaze film saddle work jump guide surprise country chapter",
+            ),
+            (
+                include_str!("./fixtures/android-2911/7c5b41ce-2bee-4797-b795-8150979e6248.json"),
+                "cfc28c6a94f3fc60a0d88f6be695dc14a33b83befdfbfac909caa72f77bea7f3973f4cca4e444bcaf5bc374343e7432cd1ba9230bb4473c88e753ed5b8997613",
+                Source::Private,
+                "ETH",
+                "ad6d1a046afa5a00922f58d6ed4bec4f4376bd44740529f25a253e635a93422e",
+            ),
+            (
+                include_str!("./fixtures/android-2911/9c6c8a23-5026-4acd-b124-bc789766ae63.json"),
+                "b71b6ce1ea9e7484055e713443fb27fa38fc9a890a86ef5c59a8706ecc7272f6e17bd142e4e5088d5bb93cb8fb27e4edcb9e71a703e134d38f790f799b9e2ba2",
+                Source::KeystoreV3,
+                "ETH",
+                "0f03ff97b01103a8e90a3c652f811bbd3a5d30aa0ea5b6ee9e5c3ce24073d842",
+            ),
+            (
+                include_str!("./fixtures/android-2911/54cc1a75-12e3-41b7-b1cc-71a67a2d185a.json"),
+                "ce07837fa3f5c96d6387dcbeb8d1ea88a8685285fada4c1b8e2b0eb2f2cee37d5cbe74ca3967beee1a683e540e56cd3ff22318fce47e562f59768a41aa6ce258",
+                Source::Mnemonic,
+                "q",
+                "essence keep wheat ankle idea dream there destroy size budget attitude aerobic",
+            ),
+            (
+                include_str!("./fixtures/android-2911/69b2d6a0-e57b-4152-bb02-0cc43fb561cb.json"),
+                "1caface946086714e1127b7796f53e01b8e159c738cae0a622bc28ee425fece70736e23ef6b4f3dd2d98c2070ff892ebc7674ec3b3a7073160da66d0e673b75b",
+                Source::Mnemonic,
+                "DOT",
+                "wreck adult slender brass inject spring pill build run walk aerobic crash",
+            ),
+            (
+                include_str!("./fixtures/android-2911/85eb7383-ab01-4491-bfef-708b7ab63fcd.json"),
+                "6767a718812ed251a52423c46822a85a6f1ab89d804951729cd38dc3719915ae95278a5e73e24eab20b4a7f56ef72023796ec2c3eeb3c67971569de9068420b6",
+                Source::Wif,
+                "BTC",
+                "cf98ce36c05a8e3605d2f533bd812d0e24c7a792530b601cffb57488bad45b6b",
+            ),
+            (
+                include_str!("./fixtures/android-2911/399f5c5a-f2cb-45d3-9440-1b3c5c0cc39a.json"),
+                "c3c15cb6ab57f2b940d1ff6d01eea543d8acf3f78a59f475b2fe2c47beb3343d1f3e970a794886e6951250e093b0be22fa907d373405247344eb7e14d24357a9",
+                Source::Mnemonic,
+                "KSM",
+                "purity mountain arena fit month enough tired mind short garage vital scorpion",
+            ),
+            (
+                include_str!("./fixtures/android-2911/502bc8f1-4c4f-491e-8550-918c81389503.json"),
+                "36a7d0c200e779103ab0272c799062696796a57c287f26d6840037c78eba7db1866405f88955f44ef4b672f5e2fff6c5c1f84434037f303fb579253b5c795cf6",
+                Source::Mnemonic,
+                "BTC",
+                "segment need pole intact network hope level donkey machine razor advice silent",
+            ),
+            (
+                include_str!("./fixtures/android-2911/577e0968-e044-43c3-9cb8-cb1e3a199529.json"),
+                "585122eea4a7317fad3a2af4aa8b70f40e4b068711ed96f3ec0b01077e909afe60db149c56dc9ff5c7b4f9afdcd25799f976eaf271933b25d2e5a8f3a76821e7",
+                Source::Mnemonic,
+                "CKB",
+                "nurse grace cloud kit mixed throw find crack witness shed rocket raven",
+            ),
+            (
+                include_str!("./fixtures/android-2911/734e3c8a-f1a4-40a8-9be8-0ab3076d3190.json"),
+                "e653fd9f7e4abe652f64bd47eaa9a601091c007616b4746ac6def85f7dc2600f3ee162b483af9a622ae84c41009f29d10b8e89c379d96bed01a9d62c2c60b0da",
+                Source::Mnemonic,
+                "XTZ",
+                "page place valid goat hockey always picnic step bitter speed naive surround",
+            ),
+            (
+                include_str!("./fixtures/android-2911/42688af7-ad87-42d2-ba2e-38d0d2d88c54.json"),
+                "e87e36c4ed257671c8b45fc746c99f1b68906520aedddcfb4984d4d9c9131d22d7405cfe3feb3f452bfc48cd20f37a828e5f09c0696a49f027a9b1be54b57054",
+                Source::Wif,
+                "BTC",
+                "2c8f3ab066ab130db2c273044c48004ec2fb3eb9d1ed8663b45153a2ac6e2414",
+            ),
+            (
+                include_str!("./fixtures/android-2911/55569fb0-1642-497f-93b3-d788fbade733.json"),
+                "974e0c18123378f0c30cbe92857498b39c8a1c615488d5dd934fe4d7228e89daf0fc5915df1bb320e3a70443da675d6571871b9abff3f183df845b5d9f72d0a8",
+                Source::Private,
+                "",
+                "4b7cba3be2086a48f09485a63edbe0ddd1bf110ae7ee84616410fcab89472e74",
+            ),
+            (
+                include_str!("./fixtures/android-2911/576350d1-c863-45d4-aee5-5e111a00fc91.json"),
+                "8c4b85faa4b9859ecdbf93e8b876f67822697be108a437768ae9751a0b154c6e5c0f58fbe2140eefbe102bb0df6ecea5b04ddb95f268035f7c87ddbd016dbef5",
+                Source::Private,
+                "",
+                "cd58818886a3a557cb0fb62554af62e1b550bfcfe4a6d021df0d6c1098fe13ef",
+            ),
+            (
+                include_str!("./fixtures/android-2911/aa1f67af-5237-43b8-af55-8e65b66deedc.json"),
+                "f26184d66b880614fcb059c753ec8242909b60888b48d1e4302ee867a4a8c8e1431b10824bfec028dcd09757ff1881a153229078bfd56b35f9b72e2cdff42030",
+                Source::Mnemonic,
+                "ATOM",
+                "crazy appear check gaze film saddle work jump guide surprise country chapter",
+            ),
+            (
+                include_str!("./fixtures/android-2911/b16bc74d-a80d-4d9f-b600-143a27c9c2df.json"),
+                "887b54d5c570da674ff66d261288d4c6d6b66107603b9e8dfad4c53c6fd8faaf8992e433bee365cfe62d95e8fda86df6c51449783172de6df7af2b506d7b87bc",
+                Source::Mnemonic,
+                "BCH",
+                "scene hurry dawn symptom flag enough floor river runway estate swim betray",
+            ),
+            (
+                include_str!("./fixtures/android-2911/b6092d42-155c-4e94-ba09-0ffc7a35523e.json"),
+                "dae7e9317763462795e8a21ecd61d9c7ce05c046f7299afd6a4928ab5099236c86f4cd080e83c093d6b356378c0fbbcbdd5ec726bcd7ac55c3683888c316548f",
+                Source::Mnemonic,
+                "FIL",
+                "hover summer chat perfect obtain artwork castle mountain mobile retreat giraffe capital",
+            ),
+            (
+                include_str!("./fixtures/android-2911/b42279e9-38a8-4d06-b4ac-dbd19e552cdc.json"),
+                "a17c5c65bc255987ce9b7c53b1c67bcc509810b87de786acc037886070a7f94688e241c8076fc3359c3cd977c2f2e4555715396829a2a8f30e8788732b899ba9",
+                Source::Private,
+                "",
+                "2eac50d289112fed03d0bbcfbe50fcf568560aab4c00a47409c51c6a31b194b3",
+            ),
+            (
+                include_str!("./fixtures/android-2911/b6678054-a3f2-4ee6-8ec4-5c37fabbc1f0.json"),
+                "384560d9c87168b22afe219e9515fc059321a9ac4224197d200f5ac96f7217ed81d4f817da30cb40bc2a898531c32ad9fe82c66f73b9c98c0228ea380acace6c",
+                Source::Private,
+                "",
+                "8bb90efb3c5ce904bebfb63281c994621ecc5184917ace9a9e28222e1285f34f",
+            ),
+            (
+                include_str!("./fixtures/android-2911/bea65809-2e16-46af-a2ab-21f034c149a8.json"),
+                "f0362abc4ce055640bc441ab28534734ef1971aa07a8460f03bdb4e052d8428ed69afe7a9937a04e977050ce49b9e4098a4d1116c45f310e8aa2381336ff50ae",
+                Source::Mnemonic,
+                "ETH",
+                "crazy appear check gaze film saddle work jump guide surprise country chapter",
+            ),
+            (
+                include_str!("./fixtures/android-2911/c3484a0e-b397-4904-bfa6-bcec59bc8354.json"),
+                "8796c39545a9d4a59f1fd0ca9a3c7dabf872ced324a78860e0f3354902e0337998e9d5ffe2a9c7b75603338d495917caa40f4691242c958db2cd1d8e8aa8c774",
+                Source::Mnemonic,
+                "",
+                "segment need pole intact network hope level donkey machine razor advice silent",
+            ),
+            (
+                include_str!("./fixtures/android-2911/d337b532-1ad9-4843-a5a0-b46d472f6410.json"),
+                "3290219cac64298897e226d5bf91164478593b2ccfe9c0139c8ecbb2cdd9769c0696d30e74e94aba45bf4f14b7aa6c9a7436b23630c8ee1eb899d0111ec53bbc",
+                Source::Private,
+                "",
+                "b8bf582e4a072964c6e44769ba928a85be7ef35e466defccdb6e82bf3534487c",
+            ),
+            (
+                include_str!("./fixtures/android-2911/de518612-2d90-401a-aa5f-2add45f5acd0.json"),
+                "1654dc67ac799b2bd5815fe797d3fc1b7290c5977ca5650755e4df76e830bc8e5218fea898c175d95e0a09d8ea8a6f75702442734daf82833d95de0fe7e232bc",
+                Source::Mnemonic,
+                "LTC",
+                "goat wave draw civil little ugly shoot blast medal galaxy lobster bless",
+            ),
+            (
+                include_str!("./fixtures/android-2911/e8a54847-aa14-4fd2-8ddf-495371a47af2.json"),
+                "ad5ab19f4e5b4a7559943236a11d0efbdb80962cb46bd6edf3dab7a0f1a541231d09fbc28559f7f03cc341841b3451813bcd882a4dd6cc96e776b3c2379ff9dd",
+                Source::Mnemonic,
+                "EOS",
+                "segment need pole intact network hope level donkey machine razor advice silent",
+            ),
+            (
+                include_str!("./fixtures/android-2911/e3824175-14cd-4a09-b475-94dda9b3ec0e.json"),
+                "0852c029bd7267a7ee2a08e2bcfcf04197461b027b636cbc928730b60dff397006c7379925760221527ed06503ab080505bf21d11129baeab3d955957bcf79da",
+                Source::Private,
+                "",
+                "cbf6e3be8c7ada5073e6be01578885f8686480207a95f6b04edfba38dbfc8a85",
+            ),
+            (
+                include_str!("./fixtures/android-2911/f5235fee-103f-4bed-8b35-465482da91cc.json"),
+                "d34efacde823c5581869e359351d1b8b7c06f2787ea50097d5f6db1fc791c9d065a4e7c0062589685ba21d57819f3fccf7294677c623e902f553e6bbf4b7876f",
+                Source::Mnemonic,
+                "ETH",
+                "segment need pole intact network hope level donkey machine razor advice silent",
+            ),
+        ];
+
+        for t in tests {
+            let json: Value = serde_json::from_str(t.0).unwrap();
+            let version = json["version"].as_i64().unwrap_or(0);
+            match version {
+                11000 | 11001 => {
+                    let keystore_upgrade = KeystoreUpgrade::new(json.clone());
+                    assert!(keystore_upgrade.need_upgrade());
+
+                    let key = if version == 11001
+                        && (t.0.contains("POLKADOT") || t.0.contains("KUSAMA"))
+                    {
+                        Key::Password(t.1.to_string())
+                    } else {
+                        Key::DerivedKey(t.1.to_owned())
+                    };
+
+                    let mut keystore = keystore_upgrade
+                        .upgrade(&key, &IdentityNetwork::Testnet)
+                        .unwrap();
+                    let _ = keystore.unlock(&key);
+
+                    assert_eq!(keystore.meta().source, t.2);
+                    assert_eq!(keystore.meta().name, t.3);
+                    assert_eq!(keystore.export().unwrap(), t.4);
+                }
+                3 | 44 | 1 | 10001 => {
+                    let legacy = LegacyKeystore::from_json_str(t.0).unwrap();
+
+                    let key = Key::DerivedKey(t.1.to_owned());
+
+                    let mut keystore = legacy.migrate(&key, &IdentityNetwork::Testnet).unwrap();
+                    let _ = keystore.unlock(&key);
+
+                    assert_eq!(keystore.meta().source, t.2);
+                    assert_eq!(keystore.meta().name, t.3);
+                    assert_eq!(keystore.export().unwrap(), t.4);
+                }
+                _ => {}
+            }
+        }
+    }
+}
diff --git a/token-core/tcx-primitive/Cargo.toml b/token-core/tcx-primitive/Cargo.toml
index e76be5dc..ad3c655b 100644
--- a/token-core/tcx-primitive/Cargo.toml
+++ b/token-core/tcx-primitive/Cargo.toml
@@ -2,33 +2,37 @@
 name = "tcx-primitive"
 version = "0.1.0"
 authors = ["tyrone <2125081@qq.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 tcx-constants = { path = "../tcx-constants"}
-bitcoin = "0.29.2"
-byteorder = "1.4.3"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-bitcoin_hashes = "0.11.0"
-hex-literal = "0.3.4"
-hex = "0.4.3"
-lazy_static = "1.4.0"
-failure = "0.1.8"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.88"
-tiny-bip39 = "0.7.3"
-ed25519-bip32 = "0.3.2"
-blake2b_simd = "1.0.0"
-iop-keyvault = "0.0.5"
-blst = "0.3.3"
-num-bigint = "0.4"
-num-traits = "0.2"
-sha2 = "0.10.6"
-digest = "0.10.6"
-hkdf = "0.12.3"
+tcx-common = { path = "../tcx-common"}
+ed25519-dalek-bip32 = { path = "../tcx-libs/ed25519-dalek-bip32" }
 
-sp-core = "7.0.0"
-regex = { version = "1.7.0"}
-schnorrkel = "0.9.1"
+bitcoin = "=0.29.2"
+byteorder = "=1.4.3"
+secp256k1 = {version ="=0.24.3", features = ["rand", "recovery"] }
+bitcoin_hashes = "=0.11.0"
+hex-literal = "=0.3.4"
+hex = "=0.4.3"
+lazy_static = "=1.4.0"
+anyhow = { version = "=1.0.79", features = [] }
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+tiny-bip39 = "=1.0.0"
+ed25519-bip32 = "=0.3.2"
+ed25519-dalek = "=2.1.0"
+blake2b_simd = "=1.0.1"
+blst = "=0.3.3"
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+sha2 = "=0.10.6"
+digest = "=0.10.6"
+hkdf = "=0.12.3"
+
+sp-core = "=7.0.0"
+regex = { version = "=1.9.3"}
+schnorrkel = "=0.9.1"
+thiserror = "=1.0.56"
diff --git a/token-core/tcx-primitive/src/bip32.rs b/token-core/tcx-primitive/src/bip32.rs
index c6f671d4..9d663e9e 100644
--- a/token-core/tcx-primitive/src/bip32.rs
+++ b/token-core/tcx-primitive/src/bip32.rs
@@ -3,14 +3,13 @@ use super::Result;
 use crate::constant::SECP256K1_ENGINE;
 use crate::ecc::{DeterministicPrivateKey, DeterministicPublicKey, KeyError};
 
-use crate::{Derive, FromHex, Secp256k1PrivateKey, Secp256k1PublicKey, Ss58Codec, ToHex};
-use bitcoin::util::key::PublicKey;
+use crate::{Derive, Secp256k1PrivateKey, Secp256k1PublicKey, Ss58Codec};
+use tcx_common::{ripemd160, sha256, FromHex, ToHex};
 
 use bitcoin::util::base58;
 use bitcoin::util::base58::Error::InvalidLength;
 use bitcoin::util::bip32::{
-    ChainCode, ChildNumber, Error as Bip32Error, Error, ExtendedPrivKey, ExtendedPubKey,
-    Fingerprint,
+    ChainCode, ChildNumber, Error as Bip32Error, ExtendedPrivKey, ExtendedPubKey, Fingerprint,
 };
 use bitcoin::Network;
 use byteorder::BigEndian;
@@ -18,8 +17,10 @@ use byteorder::ByteOrder;
 
 use bip39::{Language, Mnemonic};
 
+#[derive(Clone)]
 pub struct Bip32DeterministicPrivateKey(ExtendedPrivKey);
 
+#[derive(Clone)]
 pub struct Bip32DeterministicPublicKey(ExtendedPubKey);
 
 impl From<Bip32Error> for KeyError {
@@ -27,7 +28,7 @@ impl From<Bip32Error> for KeyError {
         match err {
             Bip32Error::CannotDeriveFromHardenedKey => KeyError::CannotDeriveFromHardenedKey,
             Bip32Error::InvalidChildNumber(_) => KeyError::InvalidChildNumber,
-            Bip32Error::InvalidChildNumberFormat => KeyError::InvalidChildNumber,
+            Bip32Error::InvalidChildNumberFormat => KeyError::InvalidChildNumberFormat,
             Bip32Error::InvalidDerivationPathFormat => KeyError::InvalidDerivationPathFormat,
             Bip32Error::Secp256k1(_) => KeyError::Secp256k1,
             Bip32Error::UnknownVersion(_) => KeyError::UnknownVersion,
@@ -56,7 +57,7 @@ impl Bip32DeterministicPrivateKey {
 
 impl Derive for Bip32DeterministicPrivateKey {
     fn derive(&self, path: &str) -> Result<Self> {
-        let extended_key = self.0.clone();
+        let extended_key = self.0;
 
         let mut parts = path.split('/').peekable();
         if *parts.peek().unwrap() == "m" {
@@ -72,9 +73,17 @@ impl Derive for Bip32DeterministicPrivateKey {
     }
 }
 
+impl Bip32DeterministicPublicKey {
+    pub fn fingerprint(&self) -> Vec<u8> {
+        let public_key_data = self.0.public_key.serialize();
+        let hashed = ripemd160(&sha256(&public_key_data));
+        hashed.to_vec()
+    }
+}
+
 impl Derive for Bip32DeterministicPublicKey {
     fn derive(&self, path: &str) -> Result<Self> {
-        let extended_key = self.0.clone();
+        let extended_key = self.0;
 
         let mut parts = path.split('/').peekable();
         if *parts.peek().unwrap() == "m" {
@@ -108,17 +117,16 @@ impl DeterministicPrivateKey for Bip32DeterministicPrivateKey {
     }
 
     fn private_key(&self) -> Self::PrivateKey {
-        Secp256k1PrivateKey::from(
-            bitcoin::PrivateKey::from_slice(
-                self.0.private_key.secret_bytes().as_slice(),
-                bitcoin::Network::Bitcoin,
-            )
-            .expect("generate private key error"),
-        ) //TODO
+        let btc_pk = bitcoin::PrivateKey::from_slice(
+            self.0.private_key.secret_bytes().as_slice(),
+            bitcoin::Network::Bitcoin,
+        )
+        .expect("generate private key error");
+        Secp256k1PrivateKey::from(btc_pk)
     }
 
     fn deterministic_public_key(&self) -> Self::DeterministicPublicKey {
-        let pk = ExtendedPubKey::from_private(&SECP256K1_ENGINE, &self.0);
+        let pk = ExtendedPubKey::from_priv(&SECP256K1_ENGINE, &self.0);
         Bip32DeterministicPublicKey(pk)
     }
 }
@@ -150,20 +158,20 @@ impl ToHex for Bip32DeterministicPublicKey {
     fn to_hex(&self) -> String {
         let mut ret = [0; 74];
         let extended_key = self.0;
-        ret[0] = extended_key.depth as u8;
+        ret[0] = extended_key.depth;
         ret[1..5].copy_from_slice(&extended_key.parent_fingerprint[..]);
 
         BigEndian::write_u32(&mut ret[5..9], u32::from(extended_key.child_number));
 
         ret[9..41].copy_from_slice(&extended_key.chain_code[..]);
         ret[41..74].copy_from_slice(&extended_key.public_key.serialize()[..]);
-        hex::encode(ret.to_vec())
+        ret.to_hex()
     }
 }
 
 impl FromHex for Bip32DeterministicPublicKey {
-    fn from_hex(hex: &str) -> Result<Self> {
-        let data = hex::decode(hex)?;
+    fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self> {
+        let data = Vec::from_hex(hex)?;
 
         if data.len() != 74 {
             return Err(KeyError::InvalidBase58.into());
@@ -210,8 +218,8 @@ impl Ss58Codec for Bip32DeterministicPublicKey {
     fn to_ss58check_with_version(&self, version: &[u8]) -> String {
         let mut ret = [0; 78];
         let extended_key = self.0;
-        ret[0..4].copy_from_slice(&version[..]);
-        ret[4] = extended_key.depth as u8;
+        ret[0..4].copy_from_slice(version);
+        ret[4] = extended_key.depth;
         ret[5..9].copy_from_slice(&extended_key.parent_fingerprint[..]);
 
         BigEndian::write_u32(&mut ret[9..13], u32::from(extended_key.child_number));
@@ -251,8 +259,8 @@ impl Ss58Codec for Bip32DeterministicPrivateKey {
         let mut ret = [0; 78];
         let extended_key = &self.0;
 
-        ret[0..4].copy_from_slice(&version[..]);
-        ret[4] = extended_key.depth as u8;
+        ret[0..4].copy_from_slice(version);
+        ret[4] = extended_key.depth;
         ret[5..9].copy_from_slice(&extended_key.parent_fingerprint[..]);
 
         BigEndian::write_u32(&mut ret[9..13], u32::from(extended_key.child_number));
@@ -266,12 +274,15 @@ impl Ss58Codec for Bip32DeterministicPrivateKey {
 
 #[cfg(test)]
 mod tests {
-    use crate::ToHex;
     use crate::{
-        Bip32DeterministicPrivateKey, Bip32DeterministicPublicKey, Derive, DeterministicPrivateKey,
-        PrivateKey, Ss58Codec,
+        ecc::KeyError, Bip32DeterministicPrivateKey, Bip32DeterministicPublicKey, Derive,
+        DeterministicPrivateKey, PrivateKey, Ss58Codec,
     };
     use bip39::{Language, Mnemonic, Seed};
+    use bitcoin::util::{base58, bip32::Error as Bip32Error};
+    use bitcoin_hashes::hex;
+    use std::collections::HashMap;
+    use tcx_common::{FromHex, ToHex};
 
     fn default_seed() -> Seed {
         let mn = Mnemonic::from_phrase(
@@ -295,13 +306,12 @@ mod tests {
         let pub_keys = paths
             .iter()
             .map(|path| {
-                hex::encode(
-                    esk.derive(path)
-                        .unwrap()
-                        .private_key()
-                        .public_key()
-                        .to_compressed(),
-                )
+                esk.derive(path)
+                    .unwrap()
+                    .private_key()
+                    .public_key()
+                    .to_compressed()
+                    .to_hex()
             })
             .collect::<Vec<String>>();
         let expected_pub_keys = vec![
@@ -339,4 +349,114 @@ mod tests {
         assert!(xpub.is_ok());
         assert_eq!(xpub.unwrap().0.to_hex(), "03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77");
     }
+
+    #[test]
+    fn from_hex() {
+        let xpub = Bip32DeterministicPublicKey::from_ss58check_with_version("xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8");
+        assert!(xpub.is_ok());
+
+        let r= Bip32DeterministicPublicKey::from_hex("03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77").unwrap();
+        assert_eq!(r.to_string(), "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8");
+    }
+
+    #[test]
+    fn test_from_hex_invalid_base58() {
+        let actual = Bip32DeterministicPublicKey::from_hex("03a25f12b68000000044efc688fe25a1a677765526ed6737b4bfcfb0122589caab7ca4b223ffa9bb37029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af");
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            KeyError::InvalidBase58.to_string()
+        );
+    }
+
+    #[test]
+    fn export_and_import() {
+        let dpks= [
+           "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8",
+           "tpubDCpWeoTY6x4BR2PqoTFJnEdfYbjnC4G8VvKoDUPFjt2dvZJWkMRxLST1pbVW56P7zY3L5jq9MRSeff2xsLnvf9qBBN9AgvrhwfZgw5dJG6R",
+           "tpubDEbvpFLnzUaeKimACznAJmoi8JDktEudB7EK4BnJFD4jTBqxBprwZrBAEEVrSZbEL2nFELm7cH6o81z9FQ3nwrSR7Rebj4jxGFsB5BLq1EY",
+           "xpub6Bs32Yr5Phs3gB6rdNrG4az7Jgr1YKGmKXSV8i4Py4mKd7jUzag8EN6u2gTN1dYHshgL3AmJM6n1enwR1dUnQUr8nDG23G22oDtzGRopACX",
+           "vpub5ZbhUa5EheCJVJLskohSBEyL1qSAxZpMNCN36aQeHHt1jndkpeeiV48YHNiQGafTu5dPZz5e1RyjHzWu8vpAj4vixVUt1rhkrFJR8Fp2EF1"
+        ];
+
+        for dpk in dpks.iter() {
+            let (dpk, _) = Bip32DeterministicPublicKey::from_ss58check_with_version(dpk).unwrap();
+            let hex = dpk.to_hex();
+            let dpk2 = Bip32DeterministicPublicKey::from_hex(&hex).unwrap();
+            assert_eq!(dpk.to_string(), dpk2.to_string());
+        }
+    }
+
+    #[test]
+    fn test_key_error_from() {
+        let key_error = KeyError::from(Bip32Error::CannotDeriveFromHardenedKey);
+        assert_eq!(key_error, KeyError::CannotDeriveFromHardenedKey);
+        let key_error = KeyError::from(Bip32Error::InvalidChildNumber(0));
+        assert_eq!(key_error, KeyError::InvalidChildNumber);
+        let key_error = KeyError::from(Bip32Error::InvalidChildNumberFormat);
+        assert_eq!(key_error, KeyError::InvalidChildNumberFormat);
+        let key_error = KeyError::from(Bip32Error::InvalidDerivationPathFormat);
+        assert_eq!(key_error, KeyError::InvalidDerivationPathFormat);
+        let key_error = KeyError::from(Bip32Error::Secp256k1(secp256k1::Error::InvalidPublicKey));
+        assert_eq!(key_error, KeyError::Secp256k1);
+        let key_error = KeyError::from(Bip32Error::UnknownVersion([0; 4]));
+        assert_eq!(key_error, KeyError::UnknownVersion);
+        let key_error = KeyError::from(Bip32Error::WrongExtendedKeyLength(0));
+        assert_eq!(key_error, KeyError::WrongExtendedKeyLength);
+        let key_error = KeyError::from(Bip32Error::Base58(base58::Error::InvalidLength(0)));
+        assert_eq!(key_error, KeyError::Base58);
+        let key_error = KeyError::from(Bip32Error::Hex(hex::Error::InvalidChar(0)));
+        assert_eq!(key_error, KeyError::Hex);
+    }
+
+    #[test]
+    fn test_bip32_spec_vectors() {
+        let test_data1 = vec![
+            ("m", "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi", "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8"),
+            ("m/0'", "xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7", "xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw"),
+            ("m/0'/1", "xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs", "xpub6ASuArnXKPbfEwhqN6e3mwBcDTgzisQN1wXN9BJcM47sSikHjJf3UFHKkNAWbWMiGj7Wf5uMash7SyYq527Hqck2AxYysAA7xmALppuCkwQ"),
+            ("m/0'/1/2'", "xprv9z4pot5VBttmtdRTWfWQmoH1taj2axGVzFqSb8C9xaxKymcFzXBDptWmT7FwuEzG3ryjH4ktypQSAewRiNMjANTtpgP4mLTj34bhnZX7UiM", "xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5"),
+            ("m/0'/1/2'/2", "xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334", "xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV"),
+            ("m/0'/1/2'/2/1000000000", "xprvA41z7zogVVwxVSgdKUHDy1SKmdb533PjDz7J6N6mV6uS3ze1ai8FHa8kmHScGpWmj4WggLyQjgPie1rFSruoUihUZREPSL39UNdE3BBDu76", "xpub6H1LXWLaKsWFhvm6RVpEL9P4KfRZSW7abD2ttkWP3SSQvnyA8FSVqNTEcYFgJS2UaFcxupHiYkro49S8yGasTvXEYBVPamhGW6cFJodrTHy"),
+        ];
+        let test_data2 = vec![
+            ("m", "xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U", "xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB"),
+            ("m/0", "xprv9vHkqa6EV4sPZHYqZznhT2NPtPCjKuDKGY38FBWLvgaDx45zo9WQRUT3dKYnjwih2yJD9mkrocEZXo1ex8G81dwSM1fwqWpWkeS3v86pgKt", "xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH"),
+            ("m/0/2147483647'", "xprv9wSp6B7kry3Vj9m1zSnLvN3xH8RdsPP1Mh7fAaR7aRLcQMKTR2vidYEeEg2mUCTAwCd6vnxVrcjfy2kRgVsFawNzmjuHc2YmYRmagcEPdU9", "xpub6ASAVgeehLbnwdqV6UKMHVzgqAG8Gr6riv3Fxxpj8ksbH9ebxaEyBLZ85ySDhKiLDBrQSARLq1uNRts8RuJiHjaDMBU4Zn9h8LZNnBC5y4a"),
+            ("m/0/2147483647'/1", "xprv9zFnWC6h2cLgpmSA46vutJzBcfJ8yaJGg8cX1e5StJh45BBciYTRXSd25UEPVuesF9yog62tGAQtHjXajPPdbRCHuWS6T8XA2ECKADdw4Ef", "xpub6DF8uhdarytz3FWdA8TvFSvvAh8dP3283MY7p2V4SeE2wyWmG5mg5EwVvmdMVCQcoNJxGoWaU9DCWh89LojfZ537wTfunKau47EL2dhHKon"),
+            ("m/0/2147483647'/1/2147483646'", "xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc", "xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL"),
+            ("m/0/2147483647'/1/2147483646'/2", "xprvA2nrNbFZABcdryreWet9Ea4LvTJcGsqrMzxHx98MMrotbir7yrKCEXw7nadnHM8Dq38EGfSh6dqA9QWTyefMLEcBYJUuekgW4BYPJcr9E7j", "xpub6FnCn6nSzZAw5Tw7cgR9bi15UV96gLZhjDstkXXxvCLsUXBGXPdSnLFbdpq8p9HmGsApME5hQTZ3emM2rnY5agb9rXpVGyy3bdW6EEgAtqt"),
+        ];
+        let test_data3 = vec![
+            ("m", "xprv9s21ZrQH143K25QhxbucbDDuQ4naNntJRi4KUfWT7xo4EKsHt2QJDu7KXp1A3u7Bi1j8ph3EGsZ9Xvz9dGuVrtHHs7pXeTzjuxBrCmmhgC6", "xpub661MyMwAqRbcEZVB4dScxMAdx6d4nFc9nvyvH3v4gJL378CSRZiYmhRoP7mBy6gSPSCYk6SzXPTf3ND1cZAceL7SfJ1Z3GC8vBgp2epUt13"),
+            ("m/0'", "xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L", "xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y"),
+        ];
+        let test_data4 = vec![
+            ("m", "xprv9s21ZrQH143K48vGoLGRPxgo2JNkJ3J3fqkirQC2zVdk5Dgd5w14S7fRDyHH4dWNHUgkvsvNDCkvAwcSHNAQwhwgNMgZhLtQC63zxwhQmRv", "xpub661MyMwAqRbcGczjuMoRm6dXaLDEhW1u34gKenbeYqAix21mdUKJyuyu5F1rzYGVxyL6tmgBUAEPrEz92mBXjByMRiJdba9wpnN37RLLAXa"),
+            ("m/0'", "xprv9vB7xEWwNp9kh1wQRfCCQMnZUEG21LpbR9NPCNN1dwhiZkjjeGRnaALmPXCX7SgjFTiCTT6bXes17boXtjq3xLpcDjzEuGLQBM5ohqkao9G", "xpub69AUMk3qDBi3uW1sXgjCmVjJ2G6WQoYSnNHyzkmdCHEhSZ4tBok37xfFEqHd2AddP56Tqp4o56AePAgCjYdvpW2PU2jbUPFKsav5ut6Ch1m"),
+            ("m/0'/1'", "xprv9xJocDuwtYCMNAo3Zw76WENQeAS6WGXQ55RCy7tDJ8oALr4FWkuVoHJeHVAcAqiZLE7Je3vZJHxspZdFHfnBEjHqU5hG1Jaj32dVoS6XLT1", "xpub6BJA1jSqiukeaesWfxe6sNK9CCGaujFFSJLomWHprUL9DePQ4JDkM5d88n49sMGJxrhpjazuXYWdMf17C9T5XnxkopaeS7jGk1GyyVziaMt"),
+        ];
+        let mut test_data = HashMap::new();
+        test_data.insert("000102030405060708090a0b0c0d0e0f", test_data1);
+        test_data.insert("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542", test_data2);
+        test_data.insert("4b381541583be4423346c643850da4b320e46a87ae3d2a4e6da11eba819cd4acba45d239319ac14f863b8d5ab5a0d0c64d2e8a1e7d1457df2e5a3c51c73235be", test_data3);
+        test_data.insert(
+            "3ddd5602285899a946114506157c7997e5444528f3003f6134712147db19b678",
+            test_data4,
+        );
+        for data_list in test_data.iter() {
+            let seed = Vec::from_hex(data_list.0).unwrap();
+            for data in data_list.1.iter().enumerate() {
+                let pri_key = Bip32DeterministicPrivateKey::from_seed(&seed).unwrap();
+                if data.0 == 0 && "m".eq(data.1 .0) {
+                    assert_eq!(pri_key.to_string(), data.1 .1);
+                    assert_eq!(pri_key.deterministic_public_key().to_string(), data.1 .2);
+                    continue;
+                }
+                let pri_key = pri_key.derive(data.1 .0).unwrap();
+                let pub_key = pri_key.deterministic_public_key();
+                assert_eq!(pri_key.to_string(), data.1 .1);
+                assert_eq!(pub_key.to_string(), data.1 .2);
+            }
+        }
+    }
 }
diff --git a/token-core/tcx-primitive/src/bls.rs b/token-core/tcx-primitive/src/bls.rs
index 7005480d..fa1adeab 100644
--- a/token-core/tcx-primitive/src/bls.rs
+++ b/token-core/tcx-primitive/src/bls.rs
@@ -2,7 +2,7 @@ use crate::ecc::{KeyError, PrivateKey as TraitPrivateKey, PublicKey as TraitPubl
 use crate::Result;
 use blst::min_pk::{PublicKey, SecretKey};
 
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct BLSPublicKey(PublicKey);
 
 #[derive(Clone)]
@@ -20,6 +20,18 @@ impl From<SecretKey> for BLSPrivateKey {
     }
 }
 
+impl BLSPrivateKey {
+    pub const DEFAULT_DST: &'static str = "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_";
+
+    pub fn sign(&self, message: &[u8], dst: &str) -> Result<Vec<u8>> {
+        Ok(self
+            .0
+            .sign(message, dst.as_bytes(), &[])
+            .compress()
+            .to_vec())
+    }
+}
+
 impl TraitPrivateKey for BLSPrivateKey {
     type PublicKey = BLSPublicKey;
 
@@ -27,6 +39,9 @@ impl TraitPrivateKey for BLSPrivateKey {
         if data.len() < 31 || data.len() > 32 {
             return Err(KeyError::InvalidBlsKey.into());
         }
+
+        // unlike ETH2, which stores private keys in big-endian order, Filecoin stores and interprets private keys in little-endian order
+        // https://docs.filecoin.io/basics/the-blockchain/addresses#public-keys
         let mut temp_data = data.to_vec();
         temp_data.reverse();
         if data.len() == 31 {
@@ -41,26 +56,6 @@ impl TraitPrivateKey for BLSPrivateKey {
         BLSPublicKey(self.0.sk_to_pk())
     }
 
-    fn sign(&self, message: &[u8]) -> Result<Vec<u8>> {
-        Ok(self
-            .0
-            .sign(message, b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_", &[])
-            .compress()
-            .to_vec())
-    }
-
-    fn sign_specified_hash(&self, message: &[u8], dst: &str) -> Result<Vec<u8>> {
-        Ok(self
-            .0
-            .sign(message, dst.as_bytes(), &[])
-            .compress()
-            .to_vec())
-    }
-
-    fn sign_recoverable(&self, _: &[u8]) -> Result<Vec<u8>> {
-        Err(KeyError::NotImplement.into())
-    }
-
     fn to_bytes(&self) -> Vec<u8> {
         let mut private_key = self.0.serialize().to_vec();
         private_key.reverse();
@@ -80,51 +75,99 @@ impl TraitPublicKey for BLSPublicKey {
 
 #[cfg(test)]
 mod tests {
+
     use crate::bls::BLSPrivateKey;
+    use crate::ecc::KeyError;
     use crate::{PrivateKey, PublicKey};
+    use bitcoin_hashes::hex::ToHex;
+    use blst::min_pk::SecretKey;
+    use tcx_common::FromHex;
+
+    use super::BLSPublicKey;
 
     #[test]
     fn test_bls_private_key() {
         let private_key = BLSPrivateKey::from_slice(
-            &hex::decode("0ef71710671a9f1cfc4bd441c017c9b6db68491929facc68ab072a9676e9e23c")
+            &Vec::from_hex("0ef71710671a9f1cfc4bd441c017c9b6db68491929facc68ab072a9676e9e23c")
                 .unwrap(),
         )
         .unwrap();
 
-        assert_eq!(hex::encode(private_key.public_key().to_bytes()),
+        assert_eq!(private_key.public_key().to_bytes().to_hex(),
                    "b2be11dc8e54ee74dbc07569fd74fe03b5f52ad71cd49a8579b6c6387891f5a20ad980ec2747618c1b9ad35846a68a3e");
     }
 
     #[test]
     fn test_bls_private_key2() {
         let mut sec_key_bytes =
-            hex::decode("068dce0c90cb428ab37a74af0191eac49648035f1aaef077734b91e05985ec55")
+            Vec::from_hex("068dce0c90cb428ab37a74af0191eac49648035f1aaef077734b91e05985ec55")
                 .unwrap();
         sec_key_bytes.reverse();
         let private_key = BLSPrivateKey::from_slice(&sec_key_bytes).unwrap();
-        assert_eq!(hex::encode(private_key.public_key().to_bytes()),
+        assert_eq!(private_key.public_key().to_bytes().to_hex(),
                    "99b1f1d84d76185466d86c34bde1101316afddae76217aa86cd066979b19858c2c9d9e56eebc1e067ac54277a61790db");
     }
 
+    #[test]
+    fn test_bls_private_key_invalid_bls_key_less_31() {
+        let actual = BLSPrivateKey::from_slice(
+            &Vec::from_hex("0ef71710671a9f1cfc4bd441c017c9b6db68491929facc68ab072a9676e9").unwrap(),
+        );
+
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            KeyError::InvalidBlsKey.to_string()
+        );
+    }
+
+    #[test]
+    fn test_bls_private_key_invalid_bls_key_more_32() {
+        let actual = BLSPrivateKey::from_slice(
+            &Vec::from_hex("0ef71710671a9f1cfc4bd441c017c9b6db68491929facc68ab072a9676e9e23ccccc")
+                .unwrap(),
+        );
+
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            KeyError::InvalidBlsKey.to_string()
+        );
+    }
+
     #[test]
     fn test_bls_sign() {
-        // let private_key = BLSPrivateKey::from_slice(
-        //     &hex::decode("068dce0c90cb428ab37a74af0191eac49648035f1aaef077734b91e05985ec55")
-        //         .unwrap(),
-        // )
-        // .unwrap();
         let mut sec_key_bytes =
-            hex::decode("068dce0c90cb428ab37a74af0191eac49648035f1aaef077734b91e05985ec55")
+            Vec::from_hex("068dce0c90cb428ab37a74af0191eac49648035f1aaef077734b91e05985ec55")
                 .unwrap();
         sec_key_bytes.reverse();
         let private_key = BLSPrivateKey::from_slice(&sec_key_bytes).unwrap();
-        let sign_result = private_key.sign_specified_hash(
-            hex::decode("23ba0fe9dc5d2fae789f31fdccb4e28e74b89aec26bafdd6c96ced598542f53e")
-                .unwrap()
-                .as_slice(),
+        let message =
+            Vec::from_hex("23ba0fe9dc5d2fae789f31fdccb4e28e74b89aec26bafdd6c96ced598542f53e")
+                .unwrap();
+        let sign_result = private_key.sign(
+            message.clone().as_slice(),
             "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_",
         );
-        assert_eq!(hex::encode(sign_result.unwrap()),
-                   "8c8ce9f8aedf380e47548501d348afa28fbfc282f50edf33555a3ed72eb24d710bc527b5108022cffb764b953941ec4014c44106d2708387d26cc84cbc5c546a1e6e56fdc194cf2649719e6ac149596d80c86bf6844b36bd47038ee96dd3962f");
+        assert_eq!(hex::encode(sign_result.unwrap()), "8c8ce9f8aedf380e47548501d348afa28fbfc282f50edf33555a3ed72eb24d710bc527b5108022cffb764b953941ec4014c44106d2708387d26cc84cbc5c546a1e6e56fdc194cf2649719e6ac149596d80c86bf6844b36bd47038ee96dd3962f");
+    }
+
+    #[test]
+    fn test_bls_public_key_from() {
+        let public_key_byte = Vec::from_hex("99b1f1d84d76185466d86c34bde1101316afddae76217aa86cd066979b19858c2c9d9e56eebc1e067ac54277a61790db").unwrap();
+        let public_key = blst::min_pk::PublicKey::from_bytes(public_key_byte.as_slice()).unwrap();
+        let bls_public_key = BLSPublicKey::from(public_key);
+        assert_eq!(bls_public_key.to_bytes().to_hex(), "99b1f1d84d76185466d86c34bde1101316afddae76217aa86cd066979b19858c2c9d9e56eebc1e067ac54277a61790db");
+    }
+
+    #[test]
+    fn test_bls_private_key_from() {
+        let private_key_byte =
+            Vec::from_hex("068dce0c90cb428ab37a74af0191eac49648035f1aaef077734b91e05985ec55")
+                .unwrap();
+        let secret_key = SecretKey::from_bytes(private_key_byte.as_slice()).unwrap();
+        let bls_private_key = BLSPrivateKey::from(secret_key);
+        assert_eq!(
+            bls_private_key.to_bytes().to_hex(),
+            "55ec8559e0914b7377f0ae1a5f034896c4ea9101af747ab38a42cb900cce8d06"
+        );
     }
 }
diff --git a/token-core/tcx-primitive/src/bls_derive.rs b/token-core/tcx-primitive/src/bls_derive.rs
index aea27194..6b2cee55 100644
--- a/token-core/tcx-primitive/src/bls_derive.rs
+++ b/token-core/tcx-primitive/src/bls_derive.rs
@@ -1,10 +1,12 @@
 use bip39::{Language, Mnemonic};
 use num_bigint::BigUint;
+use tcx_common::{FromHex, ToHex};
 
 use super::Result;
 use crate::bls::{BLSPrivateKey, BLSPublicKey};
 use crate::ecc::KeyError;
-use crate::{Derive, DeterministicPrivateKey, DeterministicPublicKey, FromHex, PrivateKey, ToHex};
+use crate::{Derive, DeterministicPrivateKey, DeterministicPublicKey, PrivateKey};
+use anyhow::anyhow;
 use num_traits::{FromPrimitive, Num, Pow};
 use sha2::digest::FixedOutput;
 use sha2::{Digest, Sha256};
@@ -47,7 +49,7 @@ impl DeterministicPrivateKey for BLSDeterministicPrivateKey {
     fn from_seed(seed: &[u8]) -> Result<Self> {
         let master_sk = derive_master_sk(seed);
         if master_sk.is_err() {
-            return Err(failure::err_msg("invalid seed"));
+            return Err(anyhow!("invalid seed"));
         }
 
         Ok(BLSDeterministicPrivateKey(master_sk.unwrap()))
@@ -71,7 +73,7 @@ impl DeterministicPrivateKey for BLSDeterministicPrivateKey {
 impl Derive for BLSDeterministicPublicKey {}
 
 impl FromHex for BLSDeterministicPublicKey {
-    fn from_hex(_: &str) -> Result<Self> {
+    fn from_hex<T: AsRef<[u8]>>(_: T) -> Result<Self> {
         panic!("not supported")
     }
 }
@@ -143,7 +145,7 @@ fn parent_sk_to_lamport_pk(parent_sk: BigUint, index: BigUint) -> Vec<u8> {
         let need_to_hash = &mut combined[i];
         sha256.update(&need_to_hash);
         let hash_ret = &sha256.finalize_fixed();
-        flattened_key[i * DIGEST_SIZE..(i + 1) * DIGEST_SIZE].clone_from_slice(&hash_ret);
+        flattened_key[i * DIGEST_SIZE..(i + 1) * DIGEST_SIZE].clone_from_slice(hash_ret);
     }
 
     let mut sha256 = Sha256::new();
@@ -160,12 +162,7 @@ fn hkdf_mod_r(ikm: &[u8]) -> BigUint {
     tmp.extend(b"\x00");
     let mut sha256 = Sha256::new();
     sha256.update(b"BLS-SIG-KEYGEN-SALT-");
-    hkdf(
-        &sha256.finalize_fixed().to_vec(),
-        &tmp,
-        b"\x00\x30",
-        &mut okm,
-    ); // L=48, info=I2OSP(L,2)
+    hkdf(&sha256.finalize_fixed(), &tmp, b"\x00\x30", &mut okm); // L=48, info=I2OSP(L,2)
     let r = BigUint::from_str_radix(
         "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
         16,
@@ -182,9 +179,7 @@ pub fn derive_child(parent_sk: BigUint, index: BigUint) -> BigUint {
 
 pub fn derive_master_sk(seed: &[u8]) -> Result<BigUint> {
     if seed.len() < 16 {
-        return Err(failure::err_msg(
-            "seed must be greater than or equal to 16 bytes",
-        ));
+        return Err(anyhow!("seed must be greater than or equal to 16 bytes",));
     }
 
     Ok(hkdf_mod_r(seed))
@@ -195,7 +190,6 @@ mod tests {
     use super::*;
     use crate::bls_derive::BLSDeterministicPrivateKey;
     use crate::{Derive, DeterministicPrivateKey, PrivateKey, PublicKey};
-    use hex;
     use num_bigint::BigUint;
 
     struct TestVector {
@@ -235,7 +229,7 @@ mod tests {
         );
 
         for t in test_vectors.iter() {
-            let seed = hex::decode(t.seed).expect("invalid seed format");
+            let seed = Vec::from_hex(t.seed).expect("invalid seed format");
             let master_sk = t
                 .master_sk
                 .parse::<BigUint>()
@@ -263,33 +257,52 @@ mod tests {
     #[test]
     fn test_bls_derive() {
         let dsk = BLSDeterministicPrivateKey::from_seed(
-            &hex::decode("c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04").unwrap()).unwrap();
+            &Vec::from_hex("c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04").unwrap()).unwrap();
 
         assert_eq!(
-            hex::encode(dsk.private_key().to_bytes()),
+            dsk.private_key().to_bytes().to_hex(),
             "7050b4223168ae407dee804d461fc3dbfe53f5dc5218debb8fab6379d559730d"
         );
 
         assert_eq!(
-            hex::encode(dsk.private_key().public_key().to_bytes()),
+            dsk.private_key().public_key().to_bytes().to_hex(),
             "a2c975348667926acf12f3eecb005044e08a7a9b7d95f30bd281b55445107367a2e5d0558be7943c8bd13f9a1a7036fb"
         );
 
         assert_eq!(
-            hex::encode(dsk.derive("m/0").unwrap().private_key().to_bytes()),
+            dsk.derive("m/0").unwrap().private_key().to_bytes().to_hex(),
             "8e0fe539158c9d590a771420cc033baedaf3749b5c08b5f85bd1e6146cbd182d"
         );
 
         assert_eq!(
-            hex::encode(dsk.derive("m/0").unwrap().private_key().public_key().to_bytes()),
+            dsk.derive("m/0").unwrap().private_key().public_key().to_bytes().to_hex(),
             "a17ec83dc60fe5d43cf3767e06a75a3394847f204052d52fd9f3d53e044a5abb250749ea35399dfed58fe1f4765a8c52"
         );
     }
 
+    #[test]
+    fn test_bls_derive_invalid_path() {
+        let dsk = BLSDeterministicPrivateKey::from_seed(
+            &Vec::from_hex("c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04").unwrap()).unwrap();
+        let actual = dsk.derive("m%0%0");
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            KeyError::InvalidDerivationPathFormat.to_string()
+        );
+    }
+
+    #[test]
+    fn test_bls_derive_invalid_seed() {
+        let actual = BLSDeterministicPrivateKey::from_seed(
+            &Vec::from_hex("ed0362ada38ead3e3e9efa3708e534").unwrap(),
+        );
+        assert_eq!(actual.err().unwrap().to_string(), "invalid seed");
+    }
+
     #[test]
     fn eth2_withdrawal_address_test() {
         let dsk = BLSDeterministicPrivateKey::from_seed(
-            &hex::decode("ee3fce3ccf05a2b58c851e321077a63ee2113235112a16fc783dc16279ff818a549ff735ac4406c624235db2d37108e34c6cbe853cbe09eb9e2369e6dd1c5aaa").unwrap()).unwrap();
+            &Vec::from_hex("ee3fce3ccf05a2b58c851e321077a63ee2113235112a16fc783dc16279ff818a549ff735ac4406c624235db2d37108e34c6cbe853cbe09eb9e2369e6dd1c5aaa").unwrap()).unwrap();
         assert_eq!(
             dsk.0,
             "18563599344197674528480235454076968403807977642577320252460493386276600523197"
@@ -300,26 +313,43 @@ mod tests {
         let child_sk = dsk.derive("m/12381/3600/1/0/0").unwrap().private_key();
 
         assert_eq!(
-            hex::encode(child_sk.to_bytes()),
+            child_sk.to_bytes().to_hex(),
             "ba87c3a478ee2a5a26c48918cc99be88bc648bee3d38c2d5faad41872a9e0d06"
         );
 
         assert_eq!(
-            hex::encode(child_sk.public_key().to_bytes()),
+            child_sk.public_key().to_bytes().to_hex(),
             "b7912fe8f9b811df8c11a1d3306d2a27d091aa37adf994d8484cdd82137d76a5bcb1206e3b4715eb598e23ea5b48dfe5"
         );
 
         let dsk = BLSDeterministicPrivateKey::from_seed(
-            &hex::decode("ed93db74a05f1a93b607ac20b447152aedfeb1f541c75abbb415c068eacdd9cd4f46f97b4ee0bbe99255016e3121ff7d283c5ab9a5d235829870b76e6e070061").unwrap()).unwrap();
+            &Vec::from_hex("ed93db74a05f1a93b607ac20b447152aedfeb1f541c75abbb415c068eacdd9cd4f46f97b4ee0bbe99255016e3121ff7d283c5ab9a5d235829870b76e6e070061").unwrap()).unwrap();
 
         let child_sk = dsk.derive("m/12381/3600/0/0/0").unwrap().private_key();
         assert_eq!(
-            hex::encode(child_sk.to_bytes()),
+            child_sk.to_bytes().to_hex(),
             "46c50b0327f01e713b27c976fcc893cf19cff729e75b70dc5caa8b3d8c1df700"
         );
         assert_eq!(
-            hex::encode(child_sk.public_key().to_bytes()),
+            child_sk.public_key().to_bytes().to_hex(),
             "8ef2719d53c1263dfa666f2f00b1e099961746e6c6ed6c70a8ab92c6dcbe7f11edf2e9769aa6f8b2e616b3f426fa8cee"
         );
     }
+
+    #[test]
+    fn test_from_mnemonic() {
+        let bdpk = BLSDeterministicPrivateKey::from_mnemonic(
+            "inject kidney empty canal shadow pact comfort wife crush horse wife sketch",
+        );
+        assert!(bdpk.is_ok())
+    }
+
+    #[test]
+    fn test_derive_master_sk_invalid_seed() {
+        let actual = derive_master_sk(&Vec::from_hex("ed0362ada38ead3e3e9efa3708e534").unwrap());
+        assert_eq!(
+            actual.err().unwrap().to_string(),
+            "seed must be greater than or equal to 16 bytes"
+        );
+    }
 }
diff --git a/token-core/tcx-primitive/src/constant.rs b/token-core/tcx-primitive/src/constant.rs
index c7ce974d..d26bc568 100644
--- a/token-core/tcx-primitive/src/constant.rs
+++ b/token-core/tcx-primitive/src/constant.rs
@@ -2,5 +2,5 @@ use lazy_static::lazy_static;
 
 lazy_static! {
     /// Lazily initialized secp256k1 engine
-    pub(crate) static ref SECP256K1_ENGINE: secp256k1::Secp256k1<secp256k1::All> = secp256k1::Secp256k1::new();
+    pub static ref SECP256K1_ENGINE: secp256k1::Secp256k1<secp256k1::All> = secp256k1::Secp256k1::new();
 }
diff --git a/token-core/tcx-primitive/src/derive.rs b/token-core/tcx-primitive/src/derive.rs
index d754db02..e8e0df16 100644
--- a/token-core/tcx-primitive/src/derive.rs
+++ b/token-core/tcx-primitive/src/derive.rs
@@ -3,6 +3,7 @@ use crate::Result;
 
 use bitcoin::util::bip32::ChildNumber;
 
+use anyhow::ensure;
 use std::convert::TryInto;
 use std::str::FromStr;
 
@@ -33,7 +34,6 @@ pub trait Derive: Sized {
     }
 }
 
-// TODO add parity string derivation path
 #[allow(dead_code)]
 impl DeriveJunction {
     pub fn soft(index: u32) -> Self {
@@ -45,22 +45,16 @@ impl DeriveJunction {
     }
 
     pub fn is_soft(&self) -> bool {
-        match *self {
-            DeriveJunction::Soft(_) => true,
-            _ => false,
-        }
+        matches!(*self, DeriveJunction::Soft(_))
     }
 
     pub fn is_hard(&self) -> bool {
-        match *self {
-            DeriveJunction::Hard(_) => true,
-            _ => false,
-        }
+        matches!(*self, DeriveJunction::Hard(_))
     }
 }
 
 impl FromStr for DeriveJunction {
-    type Err = failure::Error;
+    type Err = anyhow::Error;
 
     fn from_str(inp: &str) -> Result<Self> {
         Ok(
@@ -81,7 +75,7 @@ impl FromStr for DeriveJunction {
 }
 
 impl TryInto<ChildNumber> for DeriveJunction {
-    type Error = failure::Error;
+    type Error = anyhow::Error;
 
     fn try_into(self) -> Result<ChildNumber> {
         if let Ok(num) = match self {
@@ -99,7 +93,7 @@ impl TryInto<ChildNumber> for DeriveJunction {
 pub struct DerivePath(Vec<DeriveJunction>);
 
 impl FromStr for DerivePath {
-    type Err = failure::Error;
+    type Err = anyhow::Error;
 
     fn from_str(path: &str) -> Result<Self> {
         let mut parts = path.split('/').peekable();
@@ -240,8 +234,14 @@ mod tests {
             DeriveJunction::Hard(2147483648),
         ];
         for invalid_dj in invalid_djs {
-            let ret: Result<ChildNumber, failure::Error> = invalid_dj.try_into();
+            let ret: Result<ChildNumber, anyhow::Error> = invalid_dj.try_into();
             assert!(ret.is_err());
         }
+
+        let invalid_djs = vec![DeriveJunction::Soft(1), DeriveJunction::Hard(1)];
+        for invalid_dj in invalid_djs {
+            let ret: Result<ChildNumber, anyhow::Error> = invalid_dj.try_into();
+            assert!(ret.is_ok());
+        }
     }
 }
diff --git a/token-core/tcx-primitive/src/ecc.rs b/token-core/tcx-primitive/src/ecc.rs
index 568c843f..7cc2128a 100644
--- a/token-core/tcx-primitive/src/ecc.rs
+++ b/token-core/tcx-primitive/src/ecc.rs
@@ -1,72 +1,69 @@
-use super::Result;
+use anyhow::anyhow;
+use tcx_common::{FromHex, ToHex};
+
+use super::{Result, Ss58Codec};
 use crate::{
-    Bip32DeterministicPrivateKey, Bip32DeterministicPublicKey, Derive, FromHex,
-    Secp256k1PrivateKey, Secp256k1PublicKey, ToHex,
+    Bip32DeterministicPrivateKey, Bip32DeterministicPublicKey, Derive, Secp256k1PrivateKey,
+    Secp256k1PublicKey,
 };
 
 use crate::bls::{BLSPrivateKey, BLSPublicKey};
 use crate::bls_derive::BLSDeterministicPrivateKey;
-use crate::ecc::TypedDeterministicPrivateKey::{Bip32Ed25519, SubSr25519};
+use crate::ecc::TypedDeterministicPrivateKey::{Bip32Ed25519, SR25519};
 use crate::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
 use crate::ed25519_bip32::{Ed25519DeterministicPrivateKey, Ed25519DeterministicPublicKey};
 use crate::sr25519::{Sr25519PrivateKey, Sr25519PublicKey};
 use sp_core::Pair;
 use tcx_constants::CurveType;
+use thiserror::Error;
 
-#[derive(Fail, Debug, PartialEq)]
+#[derive(Error, Debug, PartialEq)]
 pub enum KeyError {
-    #[fail(display = "invalid_ecdsa")]
-    InvalidEcdsa,
-    #[fail(display = "invalid_child_number_format")]
+    #[error("invalid_child_number_format")]
     InvalidChildNumberFormat,
-    #[fail(display = "overflow_child_number")]
-    OverflowChildNumber,
-    #[fail(display = "invalid_derivation_path_format")]
+    #[error("invalid_derivation_path_format")]
     InvalidDerivationPathFormat,
-    #[fail(display = "invalid_signature")]
+    #[error("invalid_signature")]
     InvalidSignature,
-    #[fail(display = "invalid_child_number")]
+    #[error("invalid_child_number")]
     InvalidChildNumber,
-    #[fail(display = "cannot_derive_from_hardened_key")]
+    #[error("cannot_derive_from_hardened_key")]
     CannotDeriveFromHardenedKey,
-    // todo: why use this key?
-    #[fail(display = "cannot_derive_key")]
+    #[error("invalid_base58")]
     InvalidBase58,
-    #[fail(display = "invalid_private_key")]
+    #[error("invalid_private_key")]
     InvalidPrivateKey,
-    #[fail(display = "invalid_public_key")]
+    #[error("invalid_public_key")]
     InvalidPublicKey,
-    #[fail(display = "invalid_message")]
+    #[error("invalid_message")]
     InvalidMessage,
-    #[fail(display = "invalid_recovery_id")]
+    #[error("invalid_recovery_id")]
     InvalidRecoveryId,
-    #[fail(display = "invalid_tweak")]
+    #[error("invalid_tweak")]
     InvalidTweak,
-    #[fail(display = "not_enough_memory")]
+    #[error("not_enough_memory")]
     NotEnoughMemory,
-    #[fail(display = "invalid_curve_type")]
+    #[error("invalid_curve_type")]
     InvalidCurveType,
-    #[fail(display = "invalid_sr25519_key")]
-    InvalidSr25519Key,
-    #[fail(display = "invalid_ed25519_key")]
+    #[error("invalid_sr25519_key")]
+    InvalidSR25519Key,
+    #[error("invalid_ed25519_key")]
     InvalidEd25519Key,
-    #[fail(display = "unsupport_ed25519_pubkey_derivation")]
+    #[error("unsupport_ed25519_pubkey_derivation")]
     UnsupportEd25519PubkeyDerivation,
-    #[fail(display = "unsupport_normal_derivation")]
-    UnsupportNormalDerivation,
-    #[fail(display = "not_implement")]
+    #[error("not_implement")]
     NotImplement,
-    #[fail(display = "secp256k1_error")]
+    #[error("secp256k1_error")]
     Secp256k1,
-    #[fail(display = "unknown_version")]
+    #[error("unknown_version")]
     UnknownVersion,
-    #[fail(display = "wrong_extended_key_length")]
+    #[error("wrong_extended_key_length")]
     WrongExtendedKeyLength,
-    #[fail(display = "base58_encoding_error")]
+    #[error("base58_encoding_error")]
     Base58,
-    #[fail(display = "hexadecimal_decoding_error")]
+    #[error("hexadecimal_decoding_error")]
     Hex,
-    #[fail(display = "invalid_bls_key")]
+    #[error("invalid_bls_key")]
     InvalidBlsKey,
 }
 
@@ -83,12 +80,6 @@ pub trait PrivateKey: Sized {
 
     fn public_key(&self) -> Self::PublicKey;
 
-    fn sign(&self, _: &[u8]) -> Result<Vec<u8>>;
-
-    fn sign_specified_hash(&self, _: &[u8], dst: &str) -> Result<Vec<u8>>;
-
-    fn sign_recoverable(&self, data: &[u8]) -> Result<Vec<u8>>;
-
     fn to_bytes(&self) -> Vec<u8>;
 }
 
@@ -117,7 +108,7 @@ pub trait TypedPrivateKeyDisplay {
 
 pub enum TypedPrivateKey {
     Secp256k1(Secp256k1PrivateKey),
-    Sr25519(Sr25519PrivateKey),
+    SR25519(Sr25519PrivateKey),
     Ed25519(Ed25519PrivateKey),
     BLS(BLSPrivateKey),
 }
@@ -126,7 +117,7 @@ impl TypedPrivateKey {
     pub fn curve_type(&self) -> CurveType {
         match self {
             TypedPrivateKey::Secp256k1(_) => CurveType::SECP256k1,
-            TypedPrivateKey::Sr25519(_) => CurveType::SubSr25519,
+            TypedPrivateKey::SR25519(_) => CurveType::SR25519,
             TypedPrivateKey::Ed25519(_) => CurveType::ED25519,
             TypedPrivateKey::BLS(_) => CurveType::BLS,
         }
@@ -137,7 +128,7 @@ impl TypedPrivateKey {
             CurveType::SECP256k1 => Ok(TypedPrivateKey::Secp256k1(
                 Secp256k1PrivateKey::from_slice(data)?,
             )),
-            CurveType::SubSr25519 => Ok(TypedPrivateKey::Sr25519(Sr25519PrivateKey::from_slice(
+            CurveType::SR25519 => Ok(TypedPrivateKey::SR25519(Sr25519PrivateKey::from_slice(
                 data,
             )?)),
             CurveType::ED25519 => Ok(TypedPrivateKey::Ed25519(Ed25519PrivateKey::from_slice(
@@ -155,55 +146,50 @@ impl TypedPrivateKey {
         }
     }
 
-    pub fn to_bytes(&self) -> Vec<u8> {
+    pub fn as_sr25519(&self) -> Result<&Sr25519PrivateKey> {
         match self {
-            TypedPrivateKey::Secp256k1(sk) => sk.to_bytes(),
-            TypedPrivateKey::Sr25519(sk) => sk.to_bytes(),
-            TypedPrivateKey::Ed25519(sk) => sk.to_bytes(),
-            TypedPrivateKey::BLS(sk) => sk.to_bytes(),
+            TypedPrivateKey::SR25519(sk) => Ok(sk),
+            _ => Err(KeyError::InvalidCurveType.into()),
         }
     }
 
-    pub fn public_key(&self) -> TypedPublicKey {
+    pub fn as_bls(&self) -> Result<&BLSPrivateKey> {
         match self {
-            TypedPrivateKey::Secp256k1(sk) => TypedPublicKey::Secp256k1(sk.public_key()),
-            TypedPrivateKey::Sr25519(sk) => TypedPublicKey::Sr25519(sk.public_key()),
-            TypedPrivateKey::Ed25519(sk) => TypedPublicKey::Ed25519(sk.public_key()),
-            TypedPrivateKey::BLS(sk) => TypedPublicKey::BLS(sk.public_key()),
+            TypedPrivateKey::BLS(sk) => Ok(sk),
+            _ => Err(KeyError::InvalidCurveType.into()),
         }
     }
 
-    pub fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
+    pub fn as_ed25519(&self) -> Result<&Ed25519PrivateKey> {
         match self {
-            TypedPrivateKey::Secp256k1(sk) => sk.sign(data),
-            TypedPrivateKey::Sr25519(sk) => sk.sign(data),
-            TypedPrivateKey::Ed25519(sk) => sk.sign(data),
-            TypedPrivateKey::BLS(sk) => sk.sign(data),
+            TypedPrivateKey::Ed25519(sk) => Ok(sk),
+            _ => Err(KeyError::InvalidCurveType.into()),
         }
     }
 
-    pub fn sign_specified_hash(&self, data: &[u8], dst: &str) -> Result<Vec<u8>> {
+    pub fn to_bytes(&self) -> Vec<u8> {
         match self {
-            TypedPrivateKey::Secp256k1(sk) => sk.sign_specified_hash(data, dst),
-            TypedPrivateKey::Sr25519(sk) => sk.sign_specified_hash(data, dst),
-            TypedPrivateKey::Ed25519(sk) => sk.sign_specified_hash(data, dst),
-            TypedPrivateKey::BLS(sk) => sk.sign_specified_hash(data, dst),
+            TypedPrivateKey::Secp256k1(sk) => sk.to_bytes(),
+            TypedPrivateKey::SR25519(sk) => sk.to_bytes(),
+            TypedPrivateKey::Ed25519(sk) => sk.to_bytes(),
+            TypedPrivateKey::BLS(sk) => sk.to_bytes(),
         }
     }
 
-    pub fn sign_recoverable(&self, data: &[u8]) -> Result<Vec<u8>> {
+    pub fn public_key(&self) -> TypedPublicKey {
         match self {
-            TypedPrivateKey::Secp256k1(sk) => sk.sign_recoverable(data),
-            TypedPrivateKey::Sr25519(sk) => sk.sign_recoverable(data),
-            TypedPrivateKey::Ed25519(sk) => sk.sign_recoverable(data),
-            TypedPrivateKey::BLS(sk) => sk.sign_recoverable(data),
+            TypedPrivateKey::Secp256k1(sk) => TypedPublicKey::Secp256k1(sk.public_key()),
+            TypedPrivateKey::SR25519(sk) => TypedPublicKey::SR25519(sk.public_key()),
+            TypedPrivateKey::Ed25519(sk) => TypedPublicKey::Ed25519(sk.public_key()),
+            TypedPrivateKey::BLS(sk) => TypedPublicKey::BLS(sk.public_key()),
         }
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
 pub enum TypedPublicKey {
     Secp256k1(Secp256k1PublicKey),
-    Sr25519(Sr25519PublicKey),
+    SR25519(Sr25519PublicKey),
     Ed25519(Ed25519PublicKey),
     BLS(BLSPublicKey),
 }
@@ -212,7 +198,7 @@ impl TypedPublicKey {
     pub fn curve_type(&self) -> CurveType {
         match self {
             TypedPublicKey::Secp256k1(_) => CurveType::SECP256k1,
-            TypedPublicKey::Sr25519(_) => CurveType::SubSr25519,
+            TypedPublicKey::SR25519(_) => CurveType::SR25519,
             TypedPublicKey::Ed25519(_) => CurveType::ED25519,
             TypedPublicKey::BLS(_) => CurveType::BLS,
         }
@@ -223,9 +209,7 @@ impl TypedPublicKey {
             CurveType::SECP256k1 => Ok(TypedPublicKey::Secp256k1(Secp256k1PublicKey::from_slice(
                 data,
             )?)),
-            CurveType::SubSr25519 => {
-                Ok(TypedPublicKey::Sr25519(Sr25519PublicKey::from_slice(data)?))
-            }
+            CurveType::SR25519 => Ok(TypedPublicKey::SR25519(Sr25519PublicKey::from_slice(data)?)),
             CurveType::ED25519 => Ok(TypedPublicKey::Ed25519(Ed25519PublicKey::from_slice(data)?)),
             CurveType::BLS => Ok(TypedPublicKey::BLS(BLSPublicKey::from_slice(data)?)),
 
@@ -236,7 +220,7 @@ impl TypedPublicKey {
     pub fn to_bytes(&self) -> Vec<u8> {
         match self {
             TypedPublicKey::Secp256k1(pk) => pk.to_bytes(),
-            TypedPublicKey::Sr25519(pk) => pk.to_bytes(),
+            TypedPublicKey::SR25519(pk) => pk.to_bytes(),
             TypedPublicKey::Ed25519(pk) => pk.to_bytes(),
             TypedPublicKey::BLS(pk) => pk.to_bytes(),
         }
@@ -245,34 +229,58 @@ impl TypedPublicKey {
     pub fn as_secp256k1(&self) -> Result<&Secp256k1PublicKey> {
         match self {
             TypedPublicKey::Secp256k1(pk) => Ok(pk),
-            _ => Err(format_err!("not support")),
+            _ => Err(anyhow!("not support")),
         }
     }
 }
 
 pub enum TypedDeterministicPublicKey {
     Bip32Sepc256k1(Bip32DeterministicPublicKey),
-    SubSr25519(Sr25519PublicKey), //    SubstrateSr25519()
+    SR25519(Sr25519PublicKey),
     Bip32Ed25519(Ed25519DeterministicPublicKey),
 }
 
 impl TypedDeterministicPublicKey {
+    pub fn from_ss58check(curve: CurveType, ss58check: &str) -> Result<Self> {
+        match curve {
+            CurveType::SECP256k1 => {
+                let (bip32, _) =
+                    Bip32DeterministicPublicKey::from_ss58check_with_version(ss58check)?;
+                Ok(TypedDeterministicPublicKey::Bip32Sepc256k1(bip32))
+            }
+            _ => Err(KeyError::InvalidCurveType.into()),
+        }
+    }
+
+    pub fn to_ss58check_with_version(&self, version: &[u8]) -> String {
+        match self {
+            TypedDeterministicPublicKey::Bip32Sepc256k1(epk) => {
+                epk.to_ss58check_with_version(version)
+            }
+            _ => "".to_owned(),
+        }
+    }
     pub fn curve_type(&self) -> CurveType {
         match self {
             TypedDeterministicPublicKey::Bip32Sepc256k1(_) => CurveType::SECP256k1,
-            TypedDeterministicPublicKey::SubSr25519(_) => CurveType::SubSr25519,
+            TypedDeterministicPublicKey::SR25519(_) => CurveType::SR25519,
             TypedDeterministicPublicKey::Bip32Ed25519(_) => CurveType::ED25519,
         }
     }
 
+    pub fn fingerprint(&self) -> Result<Vec<u8>> {
+        match self {
+            TypedDeterministicPublicKey::Bip32Sepc256k1(epk) => Ok(epk.fingerprint()),
+            _ => Err(anyhow!("bls or ed25519 not support fingerprint")),
+        }
+    }
+
     pub fn public_key(&self) -> TypedPublicKey {
         match self {
             TypedDeterministicPublicKey::Bip32Sepc256k1(epk) => {
                 TypedPublicKey::Secp256k1(epk.public_key())
             }
-            TypedDeterministicPublicKey::SubSr25519(epk) => {
-                TypedPublicKey::Sr25519(epk.public_key())
-            }
+            TypedDeterministicPublicKey::SR25519(epk) => TypedPublicKey::SR25519(epk.public_key()),
             TypedDeterministicPublicKey::Bip32Ed25519(epk) => {
                 TypedPublicKey::Ed25519(epk.public_key())
             }
@@ -284,7 +292,7 @@ impl ToString for TypedDeterministicPublicKey {
     fn to_string(&self) -> String {
         match self {
             TypedDeterministicPublicKey::Bip32Sepc256k1(epk) => epk.to_string(),
-            TypedDeterministicPublicKey::SubSr25519(epk) => epk.to_string(),
+            TypedDeterministicPublicKey::SR25519(epk) => epk.to_string(),
             TypedDeterministicPublicKey::Bip32Ed25519(epk) => epk.to_string(),
         }
     }
@@ -296,8 +304,8 @@ impl Derive for TypedDeterministicPublicKey {
             TypedDeterministicPublicKey::Bip32Sepc256k1(epk) => Ok(
                 TypedDeterministicPublicKey::Bip32Sepc256k1(epk.derive(path)?),
             ),
-            TypedDeterministicPublicKey::SubSr25519(epk) => {
-                Ok(TypedDeterministicPublicKey::SubSr25519(epk.derive(path)?))
+            TypedDeterministicPublicKey::SR25519(epk) => {
+                Ok(TypedDeterministicPublicKey::SR25519(epk.derive(path)?))
             }
             TypedDeterministicPublicKey::Bip32Ed25519(epk) => {
                 Ok(TypedDeterministicPublicKey::Bip32Ed25519(epk.derive(path)?))
@@ -306,9 +314,10 @@ impl Derive for TypedDeterministicPublicKey {
     }
 }
 
+#[derive(Clone)]
 pub enum TypedDeterministicPrivateKey {
     Bip32Sepc256k1(Bip32DeterministicPrivateKey),
-    SubSr25519(Sr25519PrivateKey),
+    SR25519(Sr25519PrivateKey),
     Bip32Ed25519(Ed25519DeterministicPrivateKey),
     BLS(BLSDeterministicPrivateKey),
 }
@@ -317,7 +326,7 @@ impl TypedDeterministicPrivateKey {
     pub fn curve_type(&self) -> CurveType {
         match self {
             TypedDeterministicPrivateKey::Bip32Sepc256k1(_) => CurveType::SECP256k1,
-            TypedDeterministicPrivateKey::SubSr25519(_) => CurveType::SubSr25519,
+            TypedDeterministicPrivateKey::SR25519(_) => CurveType::SR25519,
             TypedDeterministicPrivateKey::Bip32Ed25519(_) => CurveType::ED25519,
             TypedDeterministicPrivateKey::BLS(_) => CurveType::BLS,
         }
@@ -331,7 +340,7 @@ impl TypedDeterministicPrivateKey {
             CurveType::SECP256k1 => Ok(TypedDeterministicPrivateKey::Bip32Sepc256k1(
                 Bip32DeterministicPrivateKey::from_mnemonic(mnemonic)?,
             )),
-            CurveType::SubSr25519 => Ok(SubSr25519(Sr25519PrivateKey::from_mnemonic(mnemonic)?)),
+            CurveType::SR25519 => Ok(SR25519(Sr25519PrivateKey::from_mnemonic(mnemonic)?)),
             CurveType::ED25519 => Ok(Bip32Ed25519(Ed25519DeterministicPrivateKey::from_mnemonic(
                 mnemonic,
             )?)),
@@ -347,8 +356,8 @@ impl TypedDeterministicPrivateKey {
             TypedDeterministicPrivateKey::Bip32Sepc256k1(dsk) => {
                 TypedPrivateKey::Secp256k1(dsk.private_key())
             }
-            TypedDeterministicPrivateKey::SubSr25519(dsk) => {
-                TypedPrivateKey::Sr25519(dsk.private_key())
+            TypedDeterministicPrivateKey::SR25519(dsk) => {
+                TypedPrivateKey::SR25519(dsk.private_key())
             }
             TypedDeterministicPrivateKey::Bip32Ed25519(dsk) => {
                 TypedPrivateKey::Ed25519(dsk.private_key())
@@ -362,8 +371,8 @@ impl TypedDeterministicPrivateKey {
             TypedDeterministicPrivateKey::Bip32Sepc256k1(sk) => {
                 TypedDeterministicPublicKey::Bip32Sepc256k1(sk.deterministic_public_key())
             }
-            TypedDeterministicPrivateKey::SubSr25519(sk) => {
-                TypedDeterministicPublicKey::SubSr25519(sk.deterministic_public_key())
+            TypedDeterministicPrivateKey::SR25519(sk) => {
+                TypedDeterministicPublicKey::SR25519(sk.deterministic_public_key())
             }
             TypedDeterministicPrivateKey::Bip32Ed25519(sk) => {
                 TypedDeterministicPublicKey::Bip32Ed25519(sk.deterministic_public_key())
@@ -377,9 +386,9 @@ impl ToString for TypedDeterministicPrivateKey {
     fn to_string(&self) -> String {
         match self {
             TypedDeterministicPrivateKey::Bip32Sepc256k1(sk) => sk.to_string(),
-            TypedDeterministicPrivateKey::SubSr25519(sk) => hex::encode(sk.0.to_raw_vec()),
+            TypedDeterministicPrivateKey::SR25519(sk) => sk.0.to_raw_vec().to_hex(),
             TypedDeterministicPrivateKey::Bip32Ed25519(sk) => sk.to_string(),
-            TypedDeterministicPrivateKey::BLS(sk) => hex::encode(sk.0.to_string()),
+            TypedDeterministicPrivateKey::BLS(sk) => sk.0.to_string(),
         }
     }
 }
@@ -390,7 +399,7 @@ impl TypedDeterministicPublicKey {
             CurveType::SECP256k1 => Ok(TypedDeterministicPublicKey::Bip32Sepc256k1(
                 Bip32DeterministicPublicKey::from_hex(hex)?,
             )),
-            CurveType::SubSr25519 => Ok(TypedDeterministicPublicKey::SubSr25519(
+            CurveType::SR25519 => Ok(TypedDeterministicPublicKey::SR25519(
                 Sr25519PublicKey::from_hex(hex)?,
             )),
             CurveType::ED25519 => Ok(TypedDeterministicPublicKey::Bip32Ed25519(
@@ -405,7 +414,7 @@ impl ToHex for TypedDeterministicPublicKey {
     fn to_hex(&self) -> String {
         match self {
             TypedDeterministicPublicKey::Bip32Sepc256k1(epk) => epk.to_hex(),
-            TypedDeterministicPublicKey::SubSr25519(epk) => epk.to_hex(),
+            TypedDeterministicPublicKey::SR25519(epk) => epk.to_hex(),
             TypedDeterministicPublicKey::Bip32Ed25519(epk) => epk.to_hex(),
         }
     }
@@ -417,8 +426,8 @@ impl Derive for TypedDeterministicPrivateKey {
             TypedDeterministicPrivateKey::Bip32Sepc256k1(dsk) => Ok(
                 TypedDeterministicPrivateKey::Bip32Sepc256k1(dsk.derive(path)?),
             ),
-            TypedDeterministicPrivateKey::SubSr25519(dsk) => {
-                Ok(TypedDeterministicPrivateKey::SubSr25519(dsk.derive(path)?))
+            TypedDeterministicPrivateKey::SR25519(dsk) => {
+                Ok(TypedDeterministicPrivateKey::SR25519(dsk.derive(path)?))
             }
             TypedDeterministicPrivateKey::Bip32Ed25519(dsk) => Ok(
                 TypedDeterministicPrivateKey::Bip32Ed25519(dsk.derive(path)?),
@@ -435,6 +444,7 @@ mod tests {
     use super::{PrivateKey, PublicKey, TypedDeterministicPrivateKey, TypedPrivateKey};
     use crate::{Derive, TypedPublicKey};
     use bip39::{Language, Mnemonic, Seed};
+    use tcx_common::{FromHex, ToHex};
 
     use tcx_constants::{CurveType, TEST_MNEMONIC};
 
@@ -449,30 +459,61 @@ mod tests {
     }
 
     fn default_private_key() -> Vec<u8> {
-        hex::decode("cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc").unwrap()
+        Vec::from_hex("cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc").unwrap()
     }
 
     const PUB_KEY_HEX: &'static str =
         "02b95c249d84f417e3e395a127425428b540671cc15881eb828c17b722a53fc599";
 
+    const SR25519_PRI_KEY_HEX: &str =
+        "00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd";
+
+    const SR25519_PUB_KEY_HEX: &str =
+        "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11";
+
+    const ED25519_PUBLIC_KEY_HEX: &str =
+        "ca57eed30e4a7274ef4c648f56f58f880b20d2ca25725d9e5c13c83c08c09aeb";
+
+    const BLS_PUBLIC_KEY_HEX: &str =
+        "80f0d9dfb26b6c66254fd6663f4cbe39c4ca46e54f779c2e30c618fb57350e5b7f55b51c16e04c9d2550f3b731551ed7";
+
     #[test]
-    fn typed_private_key() {
-        let ret = TypedPrivateKey::from_slice(CurveType::ED25519, &default_private_key());
-        assert!(ret.is_ok());
+    fn test_typed_private_key() {
+        let ret = TypedPrivateKey::from_slice(CurveType::ED25519, &default_private_key()).unwrap();
+        assert_eq!(ret.public_key().to_bytes().to_hex(), ED25519_PUBLIC_KEY_HEX);
 
         let sk = TypedPrivateKey::from_slice(CurveType::SECP256k1, &default_private_key()).unwrap();
 
         assert_eq!(sk.to_bytes(), default_private_key());
         assert_eq!(sk.as_secp256k1().unwrap().to_bytes(), default_private_key());
         assert_eq!(sk.curve_type(), CurveType::SECP256k1);
-        assert_eq!(hex::encode(sk.public_key().to_bytes()), PUB_KEY_HEX);
+        assert_eq!(sk.public_key().to_bytes().to_hex(), PUB_KEY_HEX);
+        let sign_ret = sk
+            .as_secp256k1()
+            .unwrap()
+            .sign(&default_private_key())
+            .unwrap();
+        assert_eq!(sign_ret.to_hex(), "304402206614e4bfa3ba1f6c975286a0a683871d6f0525a0860631afa5bea4da78ca012a02207a663d4980abed218683f66a63bbb766975fd525b8442a0424f6347c3d4f9261");
+
+        let ret = TypedPrivateKey::from_slice(
+            CurveType::SR25519,
+            &Vec::from_hex(SR25519_PRI_KEY_HEX).unwrap(),
+        )
+        .unwrap();
+        assert_eq!(ret.to_bytes().to_hex(), SR25519_PRI_KEY_HEX);
+        assert_eq!(ret.public_key().to_bytes().to_hex(), SR25519_PUB_KEY_HEX);
 
-        let sign_ret = sk.sign(&default_private_key()).unwrap();
-        assert_eq!(hex::encode(sign_ret), "304402206614e4bfa3ba1f6c975286a0a683871d6f0525a0860631afa5bea4da78ca012a02207a663d4980abed218683f66a63bbb766975fd525b8442a0424f6347c3d4f9261");
+        let ret = TypedPrivateKey::from_slice(
+            CurveType::BLS,
+            &Vec::from_hex("8bb90efb3c5ce904bebfb63281c994621ecc5184917ace9a9e28222e1285f34f")
+                .unwrap(),
+        )
+        .unwrap();
+        assert_eq!(ret.public_key().to_bytes().to_hex(), BLS_PUBLIC_KEY_HEX);
     }
 
     #[test]
-    fn typed_deterministic_private_key() {
+    fn test_typed_deterministic_private_key() {
         let root =
             TypedDeterministicPrivateKey::from_mnemonic(CurveType::SECP256k1, &TEST_MNEMONIC)
                 .unwrap();
@@ -483,33 +524,169 @@ mod tests {
             .deterministic_public_key();
 
         assert_eq!(dpk.to_string(), "xpub6CqzLtyKdJN53jPY13W6GdyB8ZGWuFZuBPU4Xh9DXm6Q1cULVLtsyfXSjx4G77rNdCRBgi83LByaWxjtDaZfLAKT6vFUq3EhPtNwTpJigx8");
-
+        assert_eq!(
+            dpk.fingerprint().unwrap().to_hex(),
+            "a6381e76634d662f9f66a1d0f43cc058102e98c5"
+        );
         assert_eq!(dpk.curve_type(), CurveType::SECP256k1);
         assert_eq!(
-            hex::encode(dpk.public_key().to_bytes()),
+            dpk.public_key().to_bytes().to_hex(),
             "029d23439ecb195eb06a0d44a608960d18702fd97e19c53451f0548f568207af77"
         );
         let child_dpk = dpk.derive("0/0").unwrap();
         assert_eq!(child_dpk.to_string(), "xpub6FuzpGNBc46EfvmcvECyqXjrzGcKErQgpQcpvhw1tiC5yXvi1jUkzudMpdg5AaguiFstdVR5ASDbSceBswKRy6cAhpTgozmgxMUayPDrLLX");
 
+        let child_dpk = dpk.derive("m/0/0").unwrap();
+        assert_eq!(child_dpk.to_string(), "xpub6FuzpGNBc46EfvmcvECyqXjrzGcKErQgpQcpvhw1tiC5yXvi1jUkzudMpdg5AaguiFstdVR5ASDbSceBswKRy6cAhpTgozmgxMUayPDrLLX");
+
         let dsk = root.derive("m/44'/0'/0'").unwrap();
 
         assert_eq!(dsk.to_string(), "xprv9yrdwPSRnvomqFK4u1y5uW2SaXS2Vnr3pAYTjJjbyRZR8p9BwoadRsCxtgUFdAKeRPbwvGRcCSYMV69nNK4N2kadevJ6L5iQVy1SwGKDTHQ");
     }
 
+    #[test]
+    fn test_typed_deterministic_private_key_sr25519() {
+        let root = TypedDeterministicPrivateKey::from_mnemonic(CurveType::SR25519, &TEST_MNEMONIC)
+            .unwrap();
+
+        let dpk = root.derive("//imToken").unwrap().deterministic_public_key();
+
+        assert_eq!(
+            dpk.to_string(),
+            "5ESCvFvYLLakjmzst4aPUZXDPR5iTXJ3NwKiJ78E7hGUoQo6"
+        );
+        assert_eq!(dpk.curve_type(), CurveType::SR25519);
+        assert_eq!(
+            dpk.public_key().to_bytes().to_hex(),
+            "68de739095eeaf297751644dcd723d6a9319069fe6fe440d28426ed89dddb454"
+        );
+        let child_dpk = dpk.derive("/Polkadot/0").unwrap();
+        assert_eq!(
+            child_dpk.to_string(),
+            "5EHrYeBgkMX8Q2yMcF2gYZKdpRF31cqMxKMtbM19YPRCBYpv"
+        );
+
+        let child_dpk = dpk.derive("/KUSAMA/0").unwrap();
+        assert_eq!(
+            child_dpk.to_string(),
+            "5DyZBGXwBtcwbra7QnDqJX5VnJmb9aicTdUamXSurgxY5dpW"
+        );
+    }
+
+    #[test]
+    fn typed_deterministic_private_key_ed25519() {
+        let root = TypedDeterministicPrivateKey::from_mnemonic(CurveType::ED25519, &TEST_MNEMONIC)
+            .unwrap();
+
+        let dpk = root
+            .derive("m/44'/0'/0'")
+            .unwrap()
+            .deterministic_public_key();
+
+        assert_eq!(
+            dpk.to_string(),
+            "636fe2cbc0741584e6b71dc00a3fc85e1f616f98a2b21eb8e1fd86bc1e4e3bf3"
+        );
+        assert_eq!(dpk.curve_type(), CurveType::ED25519);
+        assert_eq!(
+            dpk.public_key().to_bytes().to_hex(),
+            "636fe2cbc0741584e6b71dc00a3fc85e1f616f98a2b21eb8e1fd86bc1e4e3bf3"
+        );
+    }
+
     #[test]
     fn test_typed_public_key() {
-        let pub_key = hex::decode(PUB_KEY_HEX).unwrap();
+        let pub_key = Vec::from_hex(PUB_KEY_HEX).unwrap();
 
         let pk = TypedPublicKey::from_slice(CurveType::SECP256k1, &pub_key).unwrap();
 
         assert_eq!(pk.curve_type(), CurveType::SECP256k1);
 
-        assert_eq!(hex::encode(pk.to_bytes()), PUB_KEY_HEX);
+        assert_eq!(pk.to_bytes().to_hex(), PUB_KEY_HEX);
+        assert_eq!(pk.as_secp256k1().unwrap().to_bytes().to_hex(), PUB_KEY_HEX);
+        assert_eq!(pk.curve_type(), CurveType::SECP256k1);
+
+        let pk = TypedPublicKey::from_slice(
+            CurveType::SR25519,
+            Vec::from_hex(SR25519_PUB_KEY_HEX).unwrap().as_slice(),
+        )
+        .unwrap();
+        assert_eq!(pk.curve_type(), CurveType::SR25519);
+        assert_eq!(pk.to_bytes().to_hex(), SR25519_PUB_KEY_HEX);
+
+        let pk = TypedPublicKey::from_slice(
+            CurveType::ED25519,
+            Vec::from_hex(ED25519_PUBLIC_KEY_HEX).unwrap().as_slice(),
+        )
+        .unwrap();
+        assert_eq!(pk.curve_type(), CurveType::ED25519);
+        assert_eq!(pk.to_bytes().to_hex(), ED25519_PUBLIC_KEY_HEX);
+
+        let pk = TypedPublicKey::from_slice(
+            CurveType::BLS,
+            Vec::from_hex(BLS_PUBLIC_KEY_HEX).unwrap().as_slice(),
+        )
+        .unwrap();
+        assert_eq!(pk.curve_type(), CurveType::BLS);
+        assert_eq!(pk.to_bytes().to_hex(), BLS_PUBLIC_KEY_HEX);
+    }
+
+    #[test]
+    fn test_sign() {
+        let message = "0000000000000000000000000000000000000000000000000000000000000000".as_bytes();
+        let sk = TypedPrivateKey::from_slice(CurveType::ED25519, &default_private_key()).unwrap();
+        let sign_ret = sk.as_ed25519().unwrap().sign(message).unwrap();
+        assert_eq!(sign_ret.to_hex(), "65879392febf60e1fe01dfc301832c45b978f154639b2b0a3137264acc56bf41c380a81d73fa621753236dcab456afff2a4228f16fb80cce249dff3a8d7bf90b");
+
+        let sk = TypedPrivateKey::from_slice(CurveType::SR25519, message).unwrap();
+        let sign_ret = sk.as_sr25519().unwrap().sign(message);
+        assert!(sign_ret.is_ok());
+    }
+
+    #[test]
+    fn test_cross_tw() {
+        let root =
+            TypedDeterministicPrivateKey::from_mnemonic(CurveType::SECP256k1, "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal")
+                .unwrap();
+
+        let dpk = root
+            .derive("m/84'/0'/0'/0/0")
+            .unwrap()
+            .deterministic_public_key();
         assert_eq!(
-            hex::encode(pk.as_secp256k1().unwrap().to_bytes()),
-            PUB_KEY_HEX
+            dpk.public_key().to_bytes().to_hex(),
+            "02df9ef2a7a5552765178b181e1e1afdefc7849985c7dfe9647706dd4fa40df6ac"
+        );
+
+        let dpk = root
+            .derive("m/84'/0'/0'/0/2")
+            .unwrap()
+            .deterministic_public_key();
+        assert_eq!(
+            dpk.public_key().to_bytes().to_hex(),
+            "031e1f64d2f6768dccb6814545b2e2d58e26ad5f91b7cbaffe881ed572c65060db"
+        );
+
+        let dsk = root.derive("m/44'/539'/0'/0/0").unwrap();
+        assert_eq!(
+            dsk.private_key().to_bytes().to_hex(),
+            "4fb8657d6464adcaa086d6758d7f0b6b6fc026c98dc1671fcc6460b5a74abc62"
+        );
+    }
+
+    #[test]
+    fn test_bip49_spec_vertors() {
+        let root =
+            TypedDeterministicPrivateKey::from_mnemonic(CurveType::SECP256k1, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+                .unwrap();
+        let pri_key = root.derive("m/49'/1'/0'").unwrap();
+        assert_eq!(
+            pri_key.to_string(),
+            "xprv9ykubZmk6kXo3qnexcayWc1S99ZytiuVCEZzbr1bBcA47JcQtuKV7yG3j6RohVfuxoGoy6ZEQ3V71tAQ6GNE44PG6rfTBPB4nkSBnA1qcy5"
+        );
+        assert_eq!(
+            pri_key.deterministic_public_key().to_string(),
+            "xpub6CkG15Jdw866GKs84e7ysjxAhBQUJBdLZTVbQERCjwh2z6wZSSdjfmaXaMvf6Vm5sbWemK43d7HJMicz41G3vEHA9Sa5N2J9j9vgwyiHdMj"
         );
-        assert_eq!(pk.curve_type(), CurveType::SECP256k1);
     }
 }
diff --git a/token-core/tcx-primitive/src/ed25519.rs b/token-core/tcx-primitive/src/ed25519.rs
index ff5bea42..da12f425 100644
--- a/token-core/tcx-primitive/src/ed25519.rs
+++ b/token-core/tcx-primitive/src/ed25519.rs
@@ -1,10 +1,12 @@
 use crate::ecc::{KeyError, PrivateKey as TraitPrivateKey, PublicKey as TraitPublicKey};
-use crate::{FromHex, Result, ToHex};
+use tcx_common::{FromHex, ToHex};
+
+use crate::Result;
 use sp_core::ed25519::{Pair, Public};
-use sp_core::{Pair as TraitPair, Public as TraitPublic};
+use sp_core::Pair as TraitPair;
 use std::convert::TryFrom;
 
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct Ed25519PublicKey(pub Public);
 
 #[derive(Clone)]
@@ -22,6 +24,12 @@ impl From<Pair> for Ed25519PrivateKey {
     }
 }
 
+impl Ed25519PrivateKey {
+    pub fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
+        Ok(self.0.sign(data).0.to_vec())
+    }
+}
+
 impl TraitPrivateKey for Ed25519PrivateKey {
     type PublicKey = Ed25519PublicKey;
 
@@ -29,7 +37,7 @@ impl TraitPrivateKey for Ed25519PrivateKey {
         if data.len() != 32 {
             return Err(KeyError::InvalidEd25519Key.into());
         }
-        let pair = Pair::from_seed_slice(&data).map_err(|_| KeyError::InvalidEd25519Key)?;
+        let pair = Pair::from_seed_slice(data).map_err(|_| KeyError::InvalidEd25519Key)?;
         Ok(Ed25519PrivateKey(pair))
     }
 
@@ -37,18 +45,6 @@ impl TraitPrivateKey for Ed25519PrivateKey {
         Ed25519PublicKey(self.0.public())
     }
 
-    fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
-        Ok(self.0.sign(data).0.to_vec())
-    }
-
-    fn sign_specified_hash(&self, _: &[u8], _: &str) -> Result<Vec<u8>> {
-        Err(KeyError::NotImplement.into())
-    }
-
-    fn sign_recoverable(&self, data: &[u8]) -> Result<Vec<u8>> {
-        self.sign(data)
-    }
-
     fn to_bytes(&self) -> Vec<u8> {
         self.0.to_raw_vec()
     }
@@ -74,13 +70,13 @@ impl TraitPublicKey for Ed25519PublicKey {
 
 impl ToHex for Ed25519PublicKey {
     fn to_hex(&self) -> String {
-        hex::encode(self.0 .0)
+        self.0 .0.to_hex()
     }
 }
 
 impl FromHex for Ed25519PublicKey {
-    fn from_hex(hex: &str) -> Result<Self> {
-        let bytes = hex::decode(hex)?;
+    fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self> {
+        let bytes = Vec::from_hex(hex)?;
         let pk = Ed25519PublicKey::from_slice(bytes.as_slice())?;
         Ok(pk)
     }
@@ -88,26 +84,28 @@ impl FromHex for Ed25519PublicKey {
 
 #[cfg(test)]
 mod test {
+    use crate::ecc::KeyError;
     use crate::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
-    use crate::{FromHex, PrivateKey, PublicKey, ToHex};
+    use crate::{PrivateKey, PublicKey};
     use blake2b_simd::Params;
-    use hex;
+    use sp_core::ed25519::Pair;
+    use tcx_common::{FromHex, ToHex};
     #[test]
     fn from_slice_test() {
         let pk_bytes: Vec<u8> =
-            hex::decode("1111111111111111111111111111111111111111111111111111111111111111")
+            Vec::from_hex("1111111111111111111111111111111111111111111111111111111111111111")
                 .unwrap();
         let sk = Ed25519PrivateKey::from_slice(&pk_bytes);
         assert!(sk.is_ok());
 
         let pubkey_vec = sk.unwrap().public_key();
         assert_eq!(
+            pubkey_vec.to_bytes().to_hex(),
             "d04ab232742bb4ab3a1368bd4615e4e6d0224ab71a016baf8520a332c9778737",
-            hex::encode(pubkey_vec.to_bytes())
         );
         assert_eq!(
+            pubkey_vec.to_hex(),
             "d04ab232742bb4ab3a1368bd4615e4e6d0224ab71a016baf8520a332c9778737",
-            pubkey_vec.to_hex()
         );
 
         let public_key_obj = Ed25519PublicKey::from_hex(
@@ -119,20 +117,20 @@ mod test {
     #[test]
     fn sign() {
         let pk_bytes: Vec<u8> =
-            hex::decode("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f")
+            Vec::from_hex("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f")
                 .unwrap();
         let sk_result = Ed25519PrivateKey::from_slice(&pk_bytes);
         assert!(sk_result.is_ok());
 
         let sk = sk_result.ok().unwrap();
-        let msg = hex::decode("03ffaa").unwrap();
+        let msg = Vec::from_hex("03ffaa").unwrap();
         let mut params = Params::new();
         params.hash_length(32);
         let generic_hash = params.hash(&msg[..]);
         let sign_result = sk.sign(&generic_hash.as_bytes()).unwrap();
         //        println!("sign result ： {}", hex::encode(sign_result));
         let expected_val = "eaab7f4066217b072b79609a9f76cdfadd93f8dde41763887e131c02324f18c8e41b1009e334baf87f9d2e917bf4c0e73165622e5522409a0c5817234a48cc02";
-        assert_eq!(hex::encode(sign_result), expected_val);
+        assert_eq!(sign_result.to_hex(), expected_val);
     }
 
     #[test]
@@ -141,10 +139,42 @@ mod test {
         //        Ed25519PrivateKey::from_ss58check_with_version(s);
         //2bf64e07 5740dedadb610333de66ef2db2d91fd648fcbe419dff766f921ae97d536f94ce 4e26dfbb48117c6f3b3cab5049eee4d68cbef0fc0a8176e7ebb36123a28bda84
         let pk_bytes: Vec<u8> =
-            hex::decode("5740dedadb610333de66ef2db2d91fd648fcbe419dff766f921ae97d536f94ce")
+            Vec::from_hex("5740dedadb610333de66ef2db2d91fd648fcbe419dff766f921ae97d536f94ce")
                 .unwrap();
         let sk_result = Ed25519PrivateKey::from_slice(&pk_bytes).unwrap();
         let pk = sk_result.public_key().to_hex();
         println!("{}", pk);
     }
+
+    #[test]
+    fn test_ed25519() {
+        let private_key = Ed25519PrivateKey::from_slice(
+            Vec::from_hex("171cb88b1b3c1db25add599712e36245d75bc65a1a5c9e18d76f9f2b1eab401200")
+                .unwrap()
+                .as_slice(),
+        );
+        assert_eq!(
+            private_key.err().unwrap().to_string(),
+            KeyError::InvalidEd25519Key.to_string()
+        );
+
+        let pair: Pair/* Type */ = sp_core::Pair::from_seed(b"12345678901234567890123456789012");
+        let ed25519_private_key = Ed25519PrivateKey::from(pair);
+        let signature = ed25519_private_key
+            .sign(b"12345678901234567890123456789012")
+            .unwrap();
+        assert_eq!(signature.to_hex(), "23e1797e5d729e7bb21cd8a37d8c5be7171fb7626c9e45e7bd17e74bfab3a6255fb60f95e0042406b3a67d41cc65f7fc193c4ca161df9be3c8d0accf4c30cf03");
+
+        let public_key = ed25519_private_key.public_key().0;
+        assert_eq!(
+            public_key.to_hex(),
+            "2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee"
+        );
+
+        let ed25519_public_key = Ed25519PublicKey::from(public_key);
+        assert_eq!(
+            ed25519_public_key.to_hex(),
+            "2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee"
+        );
+    }
 }
diff --git a/token-core/tcx-primitive/src/ed25519_bip32.rs b/token-core/tcx-primitive/src/ed25519_bip32.rs
index 9ac318dc..1c5667b0 100644
--- a/token-core/tcx-primitive/src/ed25519_bip32.rs
+++ b/token-core/tcx-primitive/src/ed25519_bip32.rs
@@ -1,63 +1,43 @@
-use iop_keyvault::ed25519::{Ed25519, EdExtPrivateKey, EdPublicKey};
-use iop_keyvault::{
-    ChildIndex, ExtendedPrivateKey, KeyDerivationCrypto, PrivateKey as iop_keyvault_private_key,
-    Seed,
-};
+use ed25519_dalek::VerifyingKey;
+use ed25519_dalek_bip32::{DerivationPath, ExtendedSigningKey};
+use std::str::FromStr;
+
+use tcx_common::{FromHex, ToHex};
 
 use super::Result;
 use crate::ecc::KeyError;
 use crate::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
-use crate::{
-    Derive, DeterministicPrivateKey, DeterministicPublicKey, FromHex, PrivateKey, PublicKey, ToHex,
-};
+use crate::{Derive, DeterministicPrivateKey, DeterministicPublicKey, PrivateKey, PublicKey};
 use bip39::{Language, Mnemonic};
 
-pub struct Ed25519DeterministicPrivateKey(EdExtPrivateKey);
+#[derive(Clone)]
+pub struct Ed25519DeterministicPrivateKey(ExtendedSigningKey);
 
-pub struct Ed25519DeterministicPublicKey(EdPublicKey);
+#[derive(Clone)]
+pub struct Ed25519DeterministicPublicKey(VerifyingKey);
 
 impl Ed25519DeterministicPrivateKey {
     pub fn from_seed(seed: &[u8]) -> Result<Self> {
-        let seed_obj = Seed::from_bytes(&seed).unwrap();
-        let master = Ed25519::master(&seed_obj);
+        let master = ExtendedSigningKey::from_seed(seed)?;
         Ok(Ed25519DeterministicPrivateKey(master))
     }
 
     pub fn from_mnemonic(mnemonic: &str) -> Result<Self> {
         let mn = Mnemonic::from_phrase(mnemonic, Language::English)?;
         let seed = bip39::Seed::new(&mn, "");
-        Ok(Self::from_seed(seed.as_ref())?)
+        Self::from_seed(seed.as_ref())
     }
 }
 
 impl Derive for Ed25519DeterministicPrivateKey {
     fn derive(&self, path: &str) -> Result<Self> {
         let mut extended_key = self.0.clone();
-
-        let mut parts = path.split('/').peekable();
-        if *parts.peek().unwrap() == "m" {
-            parts.next();
-        }
-
-        let (mut successes, errors): (Vec<_>, Vec<_>) = parts
-            .map(|p: &str| (p, p.parse::<ChildIndex>()))
-            .partition(|(_p, i)| i.is_ok());
-        if !errors.is_empty() {
+        let derivation_path = DerivationPath::from_str(path);
+        if let Err(_e) = derivation_path {
             return Err(KeyError::InvalidDerivationPathFormat.into());
-        }
-        let child_index_vec: Vec<ChildIndex> =
-            successes.drain(..).map(|(_p, i)| i.unwrap()).collect();
-
-        for child_number in child_index_vec {
-            let chain_index = match child_number {
-                ChildIndex::Normal(_index) => {
-                    return Err(KeyError::UnsupportNormalDerivation.into());
-                }
-                ChildIndex::Hardened(index) => index,
-            };
-            extended_key = extended_key.derive_hardened_child(chain_index).unwrap();
-        }
-
+        };
+        let path: DerivationPath = path.parse()?;
+        extended_key = extended_key.derive(&path)?;
         Ok(Ed25519DeterministicPrivateKey(extended_key))
     }
 }
@@ -73,8 +53,7 @@ impl DeterministicPrivateKey for Ed25519DeterministicPrivateKey {
     type PrivateKey = Ed25519PrivateKey;
 
     fn from_seed(seed: &[u8]) -> Result<Self> {
-        let seed_obj = Seed::from_bytes(&seed).unwrap();
-        let master = Ed25519::master(&seed_obj);
+        let master = ExtendedSigningKey::from_seed(seed)?;
         Ok(Ed25519DeterministicPrivateKey(master))
     }
 
@@ -83,11 +62,11 @@ impl DeterministicPrivateKey for Ed25519DeterministicPrivateKey {
     }
 
     fn private_key(&self) -> Self::PrivateKey {
-        Ed25519PrivateKey::from_slice(self.0.private_key().to_bytes().as_slice()).unwrap()
+        Ed25519PrivateKey::from_slice(self.0.signing_key.to_bytes().as_slice()).unwrap()
     }
 
     fn deterministic_public_key(&self) -> Self::DeterministicPublicKey {
-        Ed25519DeterministicPublicKey(self.0.private_key().public_key())
+        Ed25519DeterministicPublicKey(self.0.signing_key.verifying_key())
     }
 }
 
@@ -101,13 +80,13 @@ impl DeterministicPublicKey for Ed25519DeterministicPublicKey {
 
 impl ToString for Ed25519DeterministicPrivateKey {
     fn to_string(&self) -> String {
-        hex::encode(self.0.private_key().to_bytes())
+        self.0.signing_key.to_bytes().to_hex()
     }
 }
 
 impl ToString for Ed25519DeterministicPublicKey {
     fn to_string(&self) -> String {
-        hex::encode(self.0.to_bytes())
+        self.0.to_bytes().to_hex()
     }
 }
 
@@ -118,7 +97,7 @@ impl ToHex for Ed25519DeterministicPublicKey {
 }
 
 impl FromHex for Ed25519DeterministicPublicKey {
-    fn from_hex(_hex: &str) -> Result<Self> {
+    fn from_hex<T: AsRef<[u8]>>(_: T) -> Result<Self> {
         Err(KeyError::UnsupportEd25519PubkeyDerivation.into())
     }
 }
@@ -127,35 +106,43 @@ impl FromHex for Ed25519DeterministicPublicKey {
 mod test {
     use crate::ed25519_bip32::Ed25519DeterministicPrivateKey;
     use crate::Derive;
-    use bip39::{Language, Mnemonic, Seed};
-    use hex;
-    use iop_keyvault::ExtendedPrivateKey;
+    use tcx_common::{FromHex, ToHex};
 
     #[test]
     fn from_seed_test() {
-        let seed = hex::decode("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542").unwrap();
-        //        println!("{}", hex::encode(default_seed().as_bytes()));
+        let seed = Vec::from_hex("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542").unwrap();
         //master key
         let esk = Ed25519DeterministicPrivateKey::from_seed(&seed).unwrap();
         assert_eq!(
+            esk.0.signing_key.to_bytes().to_hex(),
             "171cb88b1b3c1db25add599712e36245d75bc65a1a5c9e18d76f9f2b1eab4012",
-            hex::encode(esk.0.private_key().to_bytes())
         );
         assert_eq!(
+            esk.0.chain_code.to_hex(),
             "ef70a74db9c3a5af931b5fe73ed8e1a53464133654fd55e7a66f8570b8e33c3b",
-            hex::encode(esk.0.chain_code().to_bytes())
         );
 
         //extended key
         let path = "m/0'/2147483647'/1'/2147483646'/2'";
         let derived_result = esk.derive(path).unwrap().0;
         assert_eq!(
+            derived_result.signing_key.to_bytes().to_hex(),
             "551d333177df541ad876a60ea71f00447931c0a9da16f227c11ea080d7391b8d",
-            hex::encode(derived_result.private_key().to_bytes())
         );
         assert_eq!(
+            derived_result.chain_code.to_hex(),
             "5d70af781f3a37b829f0d060924d5e960bdc02e85423494afc0b1a41bbe196d4",
-            hex::encode(derived_result.chain_code().to_bytes())
+        );
+    }
+
+    #[test]
+    fn test_drive_invalid_path() {
+        let seed = Vec::from_hex("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542").unwrap();
+        let esk = Ed25519DeterministicPrivateKey::from_seed(&seed).unwrap();
+        let result = esk.derive("m/0'/0/x");
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_derivation_path_format"
         );
     }
 }
diff --git a/token-core/tcx-primitive/src/lib.rs b/token-core/tcx-primitive/src/lib.rs
index 1fd90f8f..d97a8ddd 100644
--- a/token-core/tcx-primitive/src/lib.rs
+++ b/token-core/tcx-primitive/src/lib.rs
@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate failure;
-
 mod bip32;
 mod bls;
 mod bls_derive;
@@ -13,12 +10,14 @@ mod rand;
 mod secp256k1;
 mod sr25519;
 mod subkey;
-
 use core::result;
 
-pub type Result<T> = result::Result<T, failure::Error>;
+pub type Result<T> = result::Result<T, anyhow::Error>;
+
+use tcx_constants::CurveType;
 
 pub use crate::bip32::{Bip32DeterministicPrivateKey, Bip32DeterministicPublicKey};
+pub use crate::constant::SECP256K1_ENGINE;
 pub use crate::derive::{get_account_path, Derive, DeriveJunction, DerivePath};
 pub use crate::ecc::{
     DeterministicPrivateKey, DeterministicPublicKey, PrivateKey, PublicKey,
@@ -46,10 +45,10 @@ pub trait Ss58Codec: Sized {
     fn to_ss58check_with_version(&self, version: &[u8]) -> String;
 }
 
-pub trait ToHex: Sized {
-    fn to_hex(&self) -> String;
-}
+pub fn mnemonic_to_public(mnemonic: &str, path: &str, curve: &str) -> Result<TypedPublicKey> {
+    let curve_type = CurveType::from_str(curve);
+    let root = TypedDeterministicPrivateKey::from_mnemonic(curve_type, mnemonic)?;
 
-pub trait FromHex: Sized {
-    fn from_hex(hex: &str) -> Result<Self>;
+    let private_key = root.derive(path)?.private_key();
+    Ok(private_key.public_key())
 }
diff --git a/token-core/tcx-primitive/src/secp256k1.rs b/token-core/tcx-primitive/src/secp256k1.rs
index 82d93bce..d034bf08 100644
--- a/token-core/tcx-primitive/src/secp256k1.rs
+++ b/token-core/tcx-primitive/src/secp256k1.rs
@@ -7,12 +7,11 @@ use bitcoin::util::key::{PrivateKey, PublicKey};
 
 use crate::{Result, Ss58Codec};
 use bitcoin::util::base58;
+use tcx_common::ToHex;
 
-use bitcoin::secp256k1::Message;
-use secp256k1::Error;
 use tcx_constants::{network_from_coin, CoinInfo};
 
-#[cfg_attr(tarpaulin, skip)]
+#[cfg_attr(tarpaulin, ignore)]
 fn transform_secp256k1_error(err: secp256k1::Error) -> KeyError {
     match err {
         secp256k1::Error::IncorrectSignature => KeyError::InvalidSignature,
@@ -27,7 +26,7 @@ fn transform_secp256k1_error(err: secp256k1::Error) -> KeyError {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct Secp256k1PublicKey(pub PublicKey);
 
 #[derive(Clone)]
@@ -61,6 +60,35 @@ impl Secp256k1PrivateKey {
     }
 }
 
+impl Secp256k1PrivateKey {
+    pub fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
+        let msg = secp256k1::Message::from_slice(data).map_err(transform_secp256k1_error)?;
+        let signature = SECP256K1_ENGINE.sign_ecdsa(&msg, &self.0.inner);
+        Ok(signature.serialize_der().to_vec())
+    }
+
+    pub fn sign_recoverable(&self, data: &[u8]) -> Result<Vec<u8>> {
+        let msg = secp256k1::Message::from_slice(data).map_err(transform_secp256k1_error)?;
+        let signature = SECP256K1_ENGINE.sign_ecdsa_recoverable(&msg, &self.0.inner);
+        let (recover_id, sign) = signature.serialize_compact();
+        let signed_bytes = [sign[..].to_vec(), vec![(recover_id.to_i32()) as u8]].concat();
+        Ok(signed_bytes)
+    }
+
+    pub fn sign_recoverable_with_noncedata(
+        &self,
+        data: &[u8],
+        noncedata: &[u8; 32],
+    ) -> Result<Vec<u8>> {
+        let msg = secp256k1::Message::from_slice(data).map_err(transform_secp256k1_error)?;
+        let signature =
+            SECP256K1_ENGINE.sign_ecdsa_recoverable_with_noncedata(&msg, &self.0.inner, noncedata);
+        let (recover_id, sign) = signature.serialize_compact();
+        let signed_bytes = [sign[..].to_vec(), vec![(recover_id.to_i32()) as u8]].concat();
+        Ok(signed_bytes)
+    }
+}
+
 impl TraitPrivateKey for Secp256k1PrivateKey {
     type PublicKey = Secp256k1PublicKey;
 
@@ -77,24 +105,6 @@ impl TraitPrivateKey for Secp256k1PrivateKey {
         Secp256k1PublicKey(self.0.public_key(&SECP256K1_ENGINE))
     }
 
-    fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
-        let msg = secp256k1::Message::from_slice(data).map_err(transform_secp256k1_error)?;
-        let signature = SECP256K1_ENGINE.sign(&msg, &self.0.inner);
-        Ok(signature.serialize_der().to_vec())
-    }
-
-    fn sign_specified_hash(&self, _: &[u8], _: &str) -> Result<Vec<u8>> {
-        Err(KeyError::NotImplement.into())
-    }
-
-    fn sign_recoverable(&self, data: &[u8]) -> Result<Vec<u8>> {
-        let msg = secp256k1::Message::from_slice(data).map_err(transform_secp256k1_error)?;
-        let signature = SECP256K1_ENGINE.sign_recoverable(&msg, &self.0.inner);
-        let (recover_id, sign) = signature.serialize_compact();
-        let signed_bytes = [sign[..].to_vec(), vec![(recover_id.to_i32()) as u8]].concat();
-        Ok(signed_bytes)
-    }
-
     fn to_bytes(&self) -> Vec<u8> {
         self.0.to_bytes()
     }
@@ -144,9 +154,9 @@ impl Ss58Codec for Secp256k1PrivateKey {
         ret[1..33].copy_from_slice(&self.0.inner[..]);
         if self.0.compressed {
             ret[33] = 1;
-            base58::check_encode_slice(&ret[..]).to_string()
+            base58::check_encode_slice(&ret[..])
         } else {
-            base58::check_encode_slice(&ret[..33]).to_string()
+            base58::check_encode_slice(&ret[..33])
         }
     }
 }
@@ -157,7 +167,7 @@ pub fn verify_private_key(private_key: &str, coin: &CoinInfo) -> Result<String>
         if version[0] != network.private_prefix {
             return Err(KeyError::InvalidPrivateKey.into());
         } else {
-            return Ok(hex::encode(pk.to_bytes()));
+            return Ok(pk.to_bytes().to_hex());
         }
     }
     Ok(private_key.to_string())
diff --git a/token-core/tcx-primitive/src/sr25519.rs b/token-core/tcx-primitive/src/sr25519.rs
index 01dc88eb..132e9882 100644
--- a/token-core/tcx-primitive/src/sr25519.rs
+++ b/token-core/tcx-primitive/src/sr25519.rs
@@ -1,14 +1,15 @@
 use crate::ecc::{KeyError, PrivateKey as TraitPrivateKey, PublicKey as TraitPublicKey};
-use crate::{FromHex, Result, ToHex};
+use crate::Result;
 use schnorrkel::SecretKey;
 use std::convert::TryFrom;
+use tcx_common::{FromHex, ToHex};
 
 use sp_core::sr25519::{Pair, Public};
-use sp_core::{Pair as TraitPair, Public as TraitPublic};
+use sp_core::Pair as TraitPair;
 
 //use sp_core::crypto::Ss58Codec;
 
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct Sr25519PublicKey(pub Public);
 
 #[derive(Clone)]
@@ -26,37 +27,29 @@ impl From<Pair> for Sr25519PrivateKey {
     }
 }
 
+impl Sr25519PrivateKey {
+    pub fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
+        Ok(self.0.sign(data).0.to_vec())
+    }
+}
+
 impl TraitPrivateKey for Sr25519PrivateKey {
     type PublicKey = Sr25519PublicKey;
 
     fn from_slice(data: &[u8]) -> Result<Self> {
-        // let mini_key: MiniSecretKey =
-        //     MiniSecretKey::from_bytes(data).expect("32 bytes can always build a key; qed");
-        //
-        // let kp = mini_key.expand_to_keypair(ExpansionMode::Ed25519);
-        let pk = SecretKey::from_ed25519_bytes(data).map_err(|_| KeyError::InvalidSr25519Key)?;
-        Ok(Sr25519PrivateKey(Pair::from(pk)))
+        let sec_key =
+            SecretKey::from_ed25519_bytes(data).map_err(|_| KeyError::InvalidSR25519Key)?;
+        Ok(Sr25519PrivateKey(Pair::from(sec_key)))
     }
 
     fn public_key(&self) -> Self::PublicKey {
         Sr25519PublicKey(self.0.public())
     }
 
-    fn sign(&self, data: &[u8]) -> Result<Vec<u8>> {
-        Ok(self.0.sign(data).0.to_vec())
-    }
-
-    fn sign_specified_hash(&self, _: &[u8], _: &str) -> Result<Vec<u8>> {
-        Err(KeyError::NotImplement.into())
-    }
-
-    fn sign_recoverable(&self, data: &[u8]) -> Result<Vec<u8>> {
-        // https://www.deadalnix.me/2017/02/17/schnorr-signatures-for-not-so-dummies/
-        self.sign(data)
-    }
-
     fn to_bytes(&self) -> Vec<u8> {
-        self.0.to_raw_vec()
+        let bytes = self.0.to_raw_vec();
+        let secret_key = SecretKey::from_bytes(&bytes).expect("sr25519 uniform key to ed25519 key");
+        secret_key.to_ed25519_bytes().to_vec()
     }
 }
 
@@ -80,13 +73,13 @@ impl TraitPublicKey for Sr25519PublicKey {
 
 impl ToHex for Sr25519PublicKey {
     fn to_hex(&self) -> String {
-        hex::encode(self.0 .0)
+        self.0.to_hex()
     }
 }
 
 impl FromHex for Sr25519PublicKey {
-    fn from_hex(hex: &str) -> Result<Self> {
-        let bytes = hex::decode(hex)?;
+    fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self> {
+        let bytes = Vec::from_hex(hex)?;
         let pk = Sr25519PublicKey::from_slice(bytes.as_slice())?;
         Ok(pk)
     }
@@ -95,15 +88,16 @@ impl FromHex for Sr25519PublicKey {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use tcx_common::ToHex;
 
     #[test]
     fn test_private_key_from_slice() {
         let pk_bytes: Vec<u8> =
-            hex::decode("00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd")
+            Vec::from_hex("00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd")
                 .unwrap();
         let pk: Sr25519PrivateKey = Sr25519PrivateKey::from_slice(&pk_bytes).unwrap();
         assert_eq!(
-            &hex::encode(pk.to_bytes())[64..],
+            &pk.to_bytes().to_hex()[64..],
             "016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd"
         );
         let public_key: Sr25519PublicKey = pk.public_key();
@@ -118,7 +112,15 @@ mod tests {
     }
 
     #[test]
-    fn test_sign_sr25519() {
-        // use integration test
+    fn test_sr25519_sec_key_convert() {
+        let bytes = Vec::from_0x_hex("0x476c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f").unwrap();
+        let ed25519_prv_key = SecretKey::from_ed25519_bytes(&bytes).unwrap();
+        let ed25519_bytes = ed25519_prv_key.to_ed25519_bytes();
+        let ed25519_prv_key_again = SecretKey::from_ed25519_bytes(&ed25519_bytes).unwrap();
+        assert_eq!("0x406c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f", ed25519_prv_key_again.to_ed25519_bytes().to_0x_hex());
+
+        let pair_41 = Pair::from(ed25519_prv_key);
+        let pair_again = Pair::from(ed25519_prv_key_again);
+        assert_eq!(pair_41.public(), pair_again.public());
     }
 }
diff --git a/token-core/tcx-primitive/src/subkey.rs b/token-core/tcx-primitive/src/subkey.rs
index 58cd840c..7fe037c3 100644
--- a/token-core/tcx-primitive/src/subkey.rs
+++ b/token-core/tcx-primitive/src/subkey.rs
@@ -8,11 +8,13 @@ use regex::Regex;
 use sp_core::crypto::Derive as SpDerive;
 use sp_core::crypto::DeriveJunction;
 
+use anyhow::anyhow;
 use sp_core::sr25519::Pair;
 use sp_core::Pair as TraitPair;
 
 impl Derive for Sr25519PrivateKey {
     fn derive(&self, path: &str) -> Result<Self> {
+        is_valid_substrate_path(path)?;
         let re_junction = Regex::new(r"/(/?[^/]+)")?;
         let junctions = re_junction
             .captures_iter(path)
@@ -23,6 +25,7 @@ impl Derive for Sr25519PrivateKey {
 
 impl Derive for Sr25519PublicKey {
     fn derive(&self, path: &str) -> Result<Self> {
+        is_valid_substrate_path(path)?;
         let re_junction = Regex::new(r"/(/?[^/]+)")?;
         let junctions = re_junction
             .captures_iter(path)
@@ -31,17 +34,28 @@ impl Derive for Sr25519PublicKey {
     }
 }
 
+fn is_valid_substrate_path(path: &str) -> Result<()> {
+    if path.is_empty() {
+        return Ok(());
+    }
+    let valid_path_regex = Regex::new(r"^(/{1,2}[\w\d]+)+$")?;
+    if !valid_path_regex.is_match(path) {
+        return Err(anyhow!("substrate_path_invalid"));
+    }
+    Ok(())
+}
+
 impl DeterministicPrivateKey for Sr25519PrivateKey {
     type DeterministicPublicKey = Sr25519PublicKey;
     type PrivateKey = Sr25519PrivateKey;
 
     fn from_seed(seed: &[u8]) -> Result<Self> {
-        let pair = Pair::from_seed_slice(seed).map_err(|_| format_err!("invalid_seed"))?;
+        let pair = Pair::from_seed_slice(seed).map_err(|_| anyhow!("invalid_seed"))?;
         Ok(Sr25519PrivateKey(pair))
     }
 
     fn from_mnemonic(mnemonic: &str) -> Result<Self> {
-        let pair = Pair::from_phrase(mnemonic, None).map_err(|_| format_err!("mnemonic_error"))?;
+        let pair = Pair::from_phrase(mnemonic, None).map_err(|_| anyhow!("mnemonic_error"))?;
         Ok(Sr25519PrivateKey(pair.0))
     }
 
@@ -64,25 +78,28 @@ impl DeterministicPublicKey for Sr25519PublicKey {
 
 #[cfg(test)]
 mod tests {
-
     use super::{Sr25519PrivateKey, Sr25519PublicKey};
     use crate::derive::Derive;
     use crate::ecc::DeterministicPrivateKey;
     use crate::ecc::DeterministicPublicKey;
     use crate::ecc::PrivateKey;
     use crate::ecc::PublicKey;
+    use crate::subkey::is_valid_substrate_path;
+    use bitcoin_hashes::hex::ToHex;
     use sp_core::crypto::Pair;
+    use tcx_common::FromHex;
     use tcx_constants::TEST_MNEMONIC;
 
     #[test]
     fn test_from_seed() {
-        let seed = hex::decode("1111111111111111111111111111111111111111111111111111111111111111")
-            .unwrap();
+        let seed =
+            Vec::from_hex("1111111111111111111111111111111111111111111111111111111111111111")
+                .unwrap();
         let hd_key = Sr25519PrivateKey::from_seed(&seed).unwrap();
         let pk = hd_key.private_key();
         assert_eq!(
             "50780547322a1ceba67ea8c552c9bc6c686f8698ac9a8cafab7cd15a1db19859",
-            hex::encode(pk.0.public().to_vec())
+            pk.0.public().to_vec().to_hex()
         );
     }
 
@@ -92,7 +109,7 @@ mod tests {
         let pk = hd_key.private_key();
         assert_eq!(
             "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11",
-            hex::encode(pk.0.public().to_vec())
+            pk.0.public().to_vec().to_hex()
         );
     }
 
@@ -100,7 +117,14 @@ mod tests {
     fn test_private_key_derive() {
         let hd_key: Sr25519PrivateKey = Sr25519PrivateKey::from_mnemonic(TEST_MNEMONIC).unwrap();
         let child_key: Sr25519PrivateKey = hd_key.derive("//imToken//Polakdot//0").unwrap();
-        assert_eq!("5022ec28bad21ff2d22d05a9730d4342e0fac36c8a837ca8e1b31a8ab285120e22d0cb94e2bb0f5df0db08a4eaeb49124f5086f8512380206a3f7367e5693fc4", hex::encode(child_key.to_bytes()));
+        assert_eq!("80126147d195fe90976e29489d6b181202d71f66531ce4430d9fd550942d947022d0cb94e2bb0f5df0db08a4eaeb49124f5086f8512380206a3f7367e5693fc4",
+                   child_key.to_bytes().to_hex());
+
+        let child_key = hd_key.derive("*&^$xfwf.de");
+        assert_eq!(
+            format!("{}", &child_key.err().unwrap()),
+            "substrate_path_invalid"
+        );
     }
 
     #[test]
@@ -120,7 +144,19 @@ mod tests {
         let child_key: Sr25519PublicKey = hd_pub_key.derive("/imToken/Polakdot/0").unwrap();
         assert_eq!(
             "8a8ae5479922fc2dac8a8fe867b20afada11edc63bca61793bedd6e5fc50c954",
-            hex::encode(child_key.to_bytes())
+            child_key.to_bytes().to_hex()
         );
     }
+
+    #[test]
+    fn test_is_valid_substrate_path() {
+        assert!(is_valid_substrate_path("/imToken/Polakdot/0").is_ok());
+        assert!(is_valid_substrate_path("/imToken/Polakdot/0/123456789").is_ok());
+        assert!(is_valid_substrate_path("//kusama").is_ok());
+        assert!(is_valid_substrate_path("").is_ok());
+
+        assert!(is_valid_substrate_path("//imToken/").is_err());
+        assert!(is_valid_substrate_path("imToken/").is_err());
+        assert!(is_valid_substrate_path("//#$").is_err());
+    }
 }
diff --git a/token-core/tcx-proto/Cargo.toml b/token-core/tcx-proto/Cargo.toml
index 201e32c2..f0ada562 100644
--- a/token-core/tcx-proto/Cargo.toml
+++ b/token-core/tcx-proto/Cargo.toml
@@ -2,14 +2,14 @@
 name = "tcx-proto"
 version = "0.1.0"
 authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
 
 [lib]
 name = "tcx_proto"
@@ -17,4 +17,4 @@ build = "build.rs"
 
 
 [build-dependencies]
-prost-build = "0.11.4"
\ No newline at end of file
+prost-build = "=0.11.4"
\ No newline at end of file
diff --git a/token-core/tcx-proto/build.rs b/token-core/tcx-proto/build.rs
index 00a9e884..334de988 100644
--- a/token-core/tcx-proto/build.rs
+++ b/token-core/tcx-proto/build.rs
@@ -14,17 +14,21 @@ fn main() {
     )
     .unwrap();
 
-    //    // tcx-chain
-    //    env::set_var("OUT_DIR", "../tcx-chain/src");
-    //    prost_build::compile_protos(&["src/tron.proto"], &["src/"]).unwrap();
+    // tcx-atom
+    env::set_var("OUT_DIR", "../tcx-atom/src");
+    prost_build::compile_protos(&["src/atom.proto"], &["src/"]).unwrap();
+
+    // tcx-eos
+    env::set_var("OUT_DIR", "../tcx-eos/src");
+    prost_build::compile_protos(&["src/eos.proto"], &["src/"]).unwrap();
 
     // tcx-tron
     env::set_var("OUT_DIR", "../tcx-tron/src");
     prost_build::compile_protos(&["src/tron.proto"], &["src/"]).unwrap();
 
     // tcx-btc-fork
-    env::set_var("OUT_DIR", "../tcx-btc-fork/src");
-    prost_build::compile_protos(&["src/btc_fork.proto"], &["src/"]).unwrap();
+    env::set_var("OUT_DIR", "../tcx-btc-kin/src");
+    prost_build::compile_protos(&["src/btc_kin.proto"], &["src/"]).unwrap();
 
     // tcx-ckb
     env::set_var("OUT_DIR", "../tcx-ckb/src");
@@ -46,7 +50,7 @@ fn main() {
     env::set_var("OUT_DIR", "../tcx-tezos/src");
     prost_build::compile_protos(&["src/tezos.proto"], &["src/"]).unwrap();
 
-    //tcx-eth2
-    env::set_var("OUT_DIR", "../tcx-eth2/src");
-    prost_build::compile_protos(&["src/eth2.proto"], &["src/"]).unwrap();
+    //tcx-eth
+    env::set_var("OUT_DIR", "../tcx-eth/src");
+    prost_build::compile_protos(&["src/eth.proto"], &["src/"]).unwrap();
 }
diff --git a/token-core/tcx-proto/src/api.proto b/token-core/tcx-proto/src/api.proto
index 3905fbb9..a28e2cf5 100644
--- a/token-core/tcx-proto/src/api.proto
+++ b/token-core/tcx-proto/src/api.proto
@@ -14,7 +14,7 @@ message TcxAction {
 }
 
 // A common response when error occurred.
-message Response {
+message GeneralResult {
     bool isSuccess = 1;
     string error = 2;
 }
@@ -31,50 +31,117 @@ message InitTokenCoreXParam {
     bool isDebug = 4;
 }
 
+message SignHashesParam {
+    string id = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
+    message DataToSign {
+        string hash = 1;
+        string path = 2;
+        string curve = 3;
+        string sigAlg = 4;
+    }
+    repeated DataToSign dataToSign = 4;
+}
+
+message SignHashesResult {
+    repeated string signatures = 1;
+}
+
+message PublicKeyDerivation {
+    string chainType = 1;
+    string path = 2;
+    string curve = 3;
+}
+
+message GetPublicKeysParam {
+    string id = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
+    repeated PublicKeyDerivation derivations = 4;
+}
+
+message GetPublicKeysResult {
+   repeated string publicKeys = 1;
+}
+
+message GetExtendedPublicKeysParam {
+    string id = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
+    repeated PublicKeyDerivation derivations = 4;
+}
+
+message GetExtendedPublicKeysResult {
+    repeated string extendedPublicKeys = 1;
+}
+
+
 //
-//// FUNCTION: export_private_key(ExportPrivateKeyParam): KeystoreCommonExportResult
+//// FUNCTION: export_private_key(ExportPrivateKeyParam): ExportResult
 ////
 //// export the private key from a private key keystore or a hd keystore
 message ExportPrivateKeyParam {
+    string id = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
+    string chainType = 4;
+    string network = 5;
+    string curve = 6;
+    string path = 7;
+}
+
+//
+//// FUNCTION: export_private_key(ExportPrivateKeyParam): ExportResult
+////
+//// export the private key from a private key keystore or a hd keystore
+message ExportJsonParam {
     string id = 1;
     string password = 2;
-    string chainType = 3;
-    string network = 4;
-    string mainAddress = 5;
-    string path = 6;
+    string chainType = 4;
+    string path = 5;
 }
 //
 ///// Keystore Common
 //
-//// FUNCTION: keystore_common_verify(WalletKeyParam) -> Response
+//// FUNCTION: verify_password(WalletKeyParam) -> Response
 ////
 //// verify the password of the keystore
 message WalletKeyParam {
     string id = 1;
-    string password = 2;
-}
-
-message ZksyncPrivateKeyFromSeedParam {
-    string seed = 1;
-}
-
-message ZksyncPrivateKeyFromSeedResult {
-    string privKey = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
 }
 
-message ZksyncSignMusigParam{
-    string privKey = 1;
-    string bytes = 2;
+message ExportMnemonicParam {
+    string id = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
 }
 
-message ZksyncSignMusigResult{
-    string signature = 1;
+message EthBatchPersonalSignParam {
+    string id = 1;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
+    repeated string data = 4;
+    string path = 5;
 }
 
-message ZksyncPrivateKeyToPubkeyHashParam{
-    string privKey = 1;
+message EthBatchPersonalSignResult {
+    repeated string signatures = 1;
 }
 
-message ZksyncPrivateKeyToPubkeyHashResult{
-    string pubKeyHash = 1;
-}
diff --git a/token-core/tcx-proto/src/atom.proto b/token-core/tcx-proto/src/atom.proto
new file mode 100644
index 00000000..3550e787
--- /dev/null
+++ b/token-core/tcx-proto/src/atom.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+package transaction;
+
+// FUNCTION: sign_tx(SignParam{input: AtomTxInput}): AtomTxOutput
+message AtomTxInput {
+    // hex string
+    string rawData = 1;
+}
+
+message AtomTxOutput {
+    // hex string
+    string signature = 1;
+}
diff --git a/token-core/tcx-proto/src/btc_fork.proto b/token-core/tcx-proto/src/btc_fork.proto
deleted file mode 100644
index a0489335..00000000
--- a/token-core/tcx-proto/src/btc_fork.proto
+++ /dev/null
@@ -1,34 +0,0 @@
-syntax = "proto3";
-package transaction;
-
-/// This file only contains btc chain(including forks) related messages.
-// ref:
-// - https://en.bitcoin.it/wiki/Transaction
-// - https://www.bitcoincash.org/spec/transaction.html
-
-// FUNCTION: sign_tx(SignParam{input: BtcForkTxInput}): BtcForkSignedTxOutput
-message Utxo {
-    string txHash = 1;
-    int32 vout = 2;
-    int64 amount = 3;
-    string address = 4;
-    string scriptPubKey = 5;
-    string derivedPath = 6;
-    int64 sequence = 7;
-}
-
-message BtcForkTxInput {
-    string to = 1;
-    int64 amount = 2;
-    repeated Utxo unspents = 3;
-    int64 fee = 4;
-    uint32 changeAddressIndex = 5;
-    string changeAddress = 6;
-    string network = 7;
-    string segWit = 8;
-}
-
-message BtcForkSignedTxOutput {
-    string signature = 1;
-    string txHash = 2;
-}
diff --git a/token-core/tcx-proto/src/btc_kin.proto b/token-core/tcx-proto/src/btc_kin.proto
new file mode 100644
index 00000000..af688ce6
--- /dev/null
+++ b/token-core/tcx-proto/src/btc_kin.proto
@@ -0,0 +1,39 @@
+syntax = "proto3";
+package transaction;
+
+/// This file only contains btc chain(including forks) related messages.
+// ref:
+// - https://en.bitcoin.it/wiki/Transaction
+// - https://www.bitcoincash.org/spec/transaction.html
+
+// FUNCTION: sign_tx(SignParam{input: BtcKinTxInput}): BtcKinTxOutput
+message Utxo {
+    string txHash = 1;
+    uint32 vout = 2;
+    uint64 amount = 3;
+    string address = 4;
+    string derivedPath = 5;
+}
+
+message BtcKinTxInput {
+    repeated Utxo inputs = 1;
+    string to = 2;
+    uint64 amount = 3;
+    uint64 fee = 4;
+    optional string opReturn = 5;
+    optional uint32 changeAddressIndex = 6;
+}
+
+message BtcKinTxOutput {
+    string rawTx = 1;
+    string txHash = 2;
+    string wtxHash = 3;
+}
+
+message OmniTxInput {
+    repeated Utxo inputs = 1;
+    string to = 2;
+    uint64 amount = 3;
+    uint64 fee = 4;
+    uint32 propertyId = 5;
+}
diff --git a/token-core/tcx-proto/src/eos.proto b/token-core/tcx-proto/src/eos.proto
new file mode 100644
index 00000000..83fb08cb
--- /dev/null
+++ b/token-core/tcx-proto/src/eos.proto
@@ -0,0 +1,28 @@
+syntax = "proto3";
+package transaction;
+
+message EosAccount {
+  string accountName = 1;
+}
+
+message EosTxInput {
+  string chainId = 1;
+  repeated string txHexs = 2;
+}
+
+message SigData {
+  string signature = 1;
+  string hash = 2;
+}
+
+message EosTxOutput {
+  repeated SigData sigData = 1;
+}
+
+message EosMessageInput {
+  string data = 1;
+}
+
+message EosMessageOutput {
+  string signature = 1;
+}
\ No newline at end of file
diff --git a/token-core/tcx-proto/src/eth.proto b/token-core/tcx-proto/src/eth.proto
new file mode 100644
index 00000000..ace1f8e7
--- /dev/null
+++ b/token-core/tcx-proto/src/eth.proto
@@ -0,0 +1,49 @@
+syntax = "proto3";
+package transaction;
+
+message EthTxInput {
+  string nonce = 1;
+  string gasPrice = 2;
+  string gasLimit = 3;
+  string to = 4;
+  string value = 5;
+  string data = 6;
+  string chainId = 7;
+  string txType = 8;
+  string maxFeePerGas = 9;
+  string maxPriorityFeePerGas = 10;
+  repeated AccessList accessList = 11;
+}
+
+message AccessList {
+  string address = 1;
+  repeated string storageKeys = 2;
+}
+
+message EthTxOutput {
+  string signature = 1;
+  string txHash = 2;
+}
+
+message EthMessageInput {
+  string message = 1;
+  SignatureType signatureType = 2;
+}
+
+enum SignatureType {
+  PersonalSign = 0;
+  EcSign = 1;
+}
+
+message EthMessageOutput {
+  string signature = 1;
+}
+
+message EthRecoverAddressInput {
+  string message = 1;
+  string signature = 2;
+}
+
+message EthRecoverAddressOutput {
+  string address = 1;
+}
\ No newline at end of file
diff --git a/token-core/tcx-proto/src/eth2.proto b/token-core/tcx-proto/src/eth2.proto
index 3b121ac4..abe91f95 100644
--- a/token-core/tcx-proto/src/eth2.proto
+++ b/token-core/tcx-proto/src/eth2.proto
@@ -2,12 +2,16 @@ syntax = "proto3";
 package transaction;
 message SignBLSToExecutionChangeParam {
   string id = 1;
-  string password = 2;
-  string genesisForkVersion = 3;
-  string genesisValidatorsRoot = 4;
-  repeated uint32 validatorIndex = 5;
-  string fromBlsPubKey = 6;
-  string eth1WithdrawalAddress = 7;
+  oneof key {
+    string password = 2;
+    string derivedKey = 3;
+  }
+
+  string genesisForkVersion = 4;
+  string genesisValidatorsRoot = 5;
+  repeated uint32 validatorIndex = 6;
+  string fromBlsPubKey = 7;
+  string eth1WithdrawalAddress = 8;
 }
 
 message SignBLSToExecutionChangeResult {
diff --git a/token-core/tcx-proto/src/params.proto b/token-core/tcx-proto/src/params.proto
index 7e51e391..0724827d 100644
--- a/token-core/tcx-proto/src/params.proto
+++ b/token-core/tcx-proto/src/params.proto
@@ -5,41 +5,64 @@ import "google/protobuf/any.proto";
 
 /// Hd Store
 
-// FUNCTION: hd_store_create(HdStoreCreateParam): WalletResult
+// FUNCTION: create_keystore(CreateKeystoreParam): KeystoreResult
 //
 // create a new hd keystore
-message HdStoreCreateParam {
+message CreateKeystoreParam {
     string password = 1;
     string passwordHint = 2;
     string name = 3;
+    string network = 4;
+}
+
+message IdentityResult {
+    string identifier = 1;
+    string ipfsId = 2;
 }
 
-message WalletResult {
+message KeystoreResult {
     string id = 1;
     string name = 2;
-    string source = 3;
-    repeated AccountResponse accounts = 4;
-    int64 createdAt = 5;
+    string identifier = 3;
+    string ipfsId = 4;
+    string source = 5;
+    int64 createdAt = 6;
+    string sourceFingerprint = 7;
 }
 
-// FUNCTION: hd_store_import(HdStoreImportParam): WalletResult
+// FUNCTION: import_mnemonic(ImportMnemonicParam): KeystoreResult
 //
 // create a new hd keystore by mnemonic
-message HdStoreImportParam {
+message ImportMnemonicParam {
     string mnemonic = 1;
     string password = 2;
-    string source = 3;
+    string network = 3;
     string name = 4;
     string passwordHint = 5;
     bool overwrite = 6;
 }
 
-// FUNCTION: hd_store_derive(HdStoreDeriveParam): AccountsResponse
+message ImportPrivateKeyResult {
+    string id = 1;
+    string name = 2;
+    string identifier = 3;
+    string ipfsId = 4;
+    string source = 5;
+    int64 createdAt = 6;
+    repeated string identifiedChainTypes = 7;
+    string identifiedNetwork = 8;
+    string identifiedCurve = 9;
+    string sourceFingerprint = 10;
+}
+
 //
 // derive new accounts from a hd keystore
-message KeystoreCommonDeriveParam {
+message DeriveAccountsParam {
     string id = 1;
-    string password = 2;
+    oneof key {
+        string password = 2;
+        string derivedKey = 3;
+    }
     message Derivation {
         string chainType = 1;
         string path = 2;
@@ -47,85 +70,93 @@ message KeystoreCommonDeriveParam {
         string segWit = 4;
         string chainId = 5;
         string curve = 6;
+        string bech32Prefix = 7;
     }
-    repeated Derivation derivations= 3;
+    repeated Derivation derivations= 4;
 }
 
 message AccountResponse {
     string chainType = 1;
     string address = 2;
     string path = 3;
-    string extendedXpubKey = 4;
+    string curve = 4;
+    string publicKey = 5;
+    string extendedPublicKey = 6;
+    string encryptedExtendedPublicKey = 7;
+    string segWit = 8;
 }
 
-message AccountsResponse {
+message DeriveAccountsResult {
     repeated AccountResponse accounts = 1;
 }
 
-// FUNCTION: hd_store_export(KeystoreCommonExportResult): KeystoreCommonExistsResult
-//
 // export the mnemonic from a hd keystore
-message KeystoreCommonExportResult {
+message ExportMnemonicResult {
     string id = 1;
-    KeyType type = 2;
-    string value = 3;
+    string mnemonic = 2;
 }
 
-// only support two types
-enum KeyType {
-    MNEMONIC = 0;
-    PRIVATE_KEY = 1;
+message ExportPrivateKeyResult {
+    string id = 1;
+    string privateKey = 2;
 }
 
+message ExportJsonResult {
+    string id = 1;
+    string json = 2;
+}
+
+// // only support two types
+// enum KeyType {
+//     MNEMONIC = 0;
+//     PRIVATE_KEY = 1;
+// }
+
 /// Private Key Store
 
-// FUNCTION: private_key_store_import(PrivateKeyStoreImportParam): WalletResult
+// FUNCTION: import_private_key(ImportPrivateKeyParam): KeystoreResult
 //
 // create a new private key keystore by a private key
-message PrivateKeyStoreImportParam {
+message ImportPrivateKeyParam {
     string privateKey = 1;
     string password = 2;
     string name = 3;
     string passwordHint = 4;
-    bool overwrite = 5;
-    string encoding = 6;
+    string network = 5;
+    bool overwrite = 6;
 }
 
-// FUNCTION: private_key_store_export(PrivateKeyStoreExportParam): KeystoreCommonExportResult
+// FUNCTION: keystore_common_exists(KeystoreCommonExistsParam): ExistsKeystoreResult
 //
-// export the private key from a private key keystore
-message PrivateKeyStoreExportParam {
-    string id = 1;
-    string password = 2;
-    string chainType = 3;
-    string network = 4;
-}
+// Check is there a keystore was generate by the special privateKey or mnemonic
+// message KeystoreCommonExistsParam {
+//     KeyType type = 1;
+//     string value = 2;
+//     string encoding = 3;
+// }
 
-/// Keystore Common
+message ExistsMnemonicParam {
+    string mnemonic = 1;
+}
 
-// FUNCTION: keystore_common_delete(WalletKeyParam) -> Response
-//
-// delete the keystore
+message ExistsPrivateKeyParam {
+    string private_key = 1;
+}
 
-// FUNCTION: keystore_common_exists(KeystoreCommonExistsParam): KeystoreCommonExistsResult
-//
-// Check is there a keystore was generate by the special privateKey or mnemonic
-message KeystoreCommonExistsParam {
-    KeyType type = 1;
-    string value = 2;
-    string encoding = 3;
+message ExistsJsonParam {
+    string json = 1;
+    string password = 2;
 }
 
-message KeystoreCommonExistsResult {
+message ExistsKeystoreResult {
     bool isExists = 1;
     string id = 2;
 }
 
-// FUNCTION: keystore_common_accounts(KeystoreCommonAccountsParam): AccountsResponse
-//
-// List all accounts from the keystore
-message KeystoreCommonAccountsParam{
-    string id = 1;
+message ImportJsonParam {
+    string json = 1;
+    string password = 2;
+    bool overwrite = 3;
 }
 
 /// Sign Transaction
@@ -141,61 +172,118 @@ message SignParam {
         string derivedKey = 3;
     }
     string chainType = 4;
-    string address = 5;
-    google.protobuf.Any input = 6;
+    string path = 5;
+    string curve = 6;
+    string network = 7;
+    string segWit = 8;
+    google.protobuf.Any input = 9;
 }
 
-/// Other
-// TODO: annotate following message usage
+message DeriveSubAccountsParam {
+    string chainType = 1;
+    string curve = 2;
+    string network = 3;
+    string segWit = 4;
+    repeated string relativePaths = 5;
+    string extendedPublicKey = 6;
+}
 
-// btc-fork
-message ExternalAddressParam {
-    string id = 1;
-    string chainType = 2;
-    uint32 externalIdx = 3;
+message DeriveSubAccountsResult {
+    repeated AccountResponse accounts = 1;
+}
+
+message EncryptDataToIpfsParam {
+    string identifier = 1;
+    string content = 2;
+}
+
+message EncryptDataToIpfsResult {
+    string identifier = 1;
+    string encrypted = 2;
+}
+
+message DecryptDataFromIpfsParam {
+    string identifier = 1;
+    string encrypted = 2;
 }
 
-message ExternalAddressResult {
-    string address = 1;
-    string derivedPath = 2;
-    string type = 3;
+message DecryptDataFromIpfsResult {
+    string identifier = 1;
+    string content = 2;
 }
 
-message ExternalAddressExtra {
-    string encXpub = 1;
-    message ExternalAddress {
-        string address = 1;
-        string derivedPath = 2;
-        string type = 3;
+message SignAuthenticationMessageParam {
+    uint64 accessTime = 1;
+    string identifier = 2 ;
+    string deviceToken = 3;
+    oneof key {
+        string password = 4;
+        string derivedKey = 5;
     }
-    ExternalAddress externalAddress = 2;
 }
 
-message BtcForkDeriveExtraParam {
-    string network = 1;
-    string segWit = 2;
+message SignAuthenticationMessageResult {
+    uint64 accessTime = 1;
+    string signature = 2;
 }
 
-message HdStoreExtendedPublicKeyParam {
-    string id = 1;
-    string password = 2;
-    string chainType = 3;
-    string address = 4;
+message MnemonicToPublicKeyParam {
+    string mnemonic = 1;
+    string path = 2;
+    string curve = 3;
+    string encoding = 4;
 }
 
-message HdStoreExtendedPublicKeyResponse {
-    string extendedPublicKey = 1;
+message MnemonicToPublicKeyResult {
+    string publicKey = 1;
 }
 
-message PublicKeyParam {
+message MigrateKeystoreParam {
     string id = 1;
-    string chainType = 2;
-    string address = 3;
+    string network = 2;
+    oneof key {
+      string password = 3;
+      string derivedKey = 4;
+    }
+}
+  
+  message MigrateKeystoreResult {
+    bool isExisted = 1;
+    string existedId = 2;
+    KeystoreResult keystore = 3;
+  }
+
+  message ScanKeystoresResult {
+    repeated KeystoreResult hdKeystores = 1;
+    repeated ImportPrivateKeyResult privateKeyKeystores = 2;
 }
 
-message PublicKeyResult {
+  message LegacyKeystoreResult {
     string id = 1;
-    string chainType = 2;
-    string address = 3;
-    string publicKey = 4;
+    string name = 2;
+    string source = 3;
+    string createdAt = 4;
+    repeated AccountResponse accounts = 5;
 }
+
+  message ScanLegacyKeystoresResult {
+    string identifier = 1;
+    string ipfsId = 2;
+    string network = 3;
+    string source = 4;
+    repeated LegacyKeystoreResult keystores = 5;
+  }
+
+
+  message BackupResult {
+    string original = 1;
+  }
+
+  message MarkIdentityWalletsParam {
+    repeated string ids = 1;
+    string source = 2;
+  }
+
+message ReadKeystoreMnemonicPathResult {
+    string path = 1;
+  }
\ No newline at end of file
diff --git a/token-core/tcx-proto/src/substrate.proto b/token-core/tcx-proto/src/substrate.proto
index ace429f3..44f1bd99 100644
--- a/token-core/tcx-proto/src/substrate.proto
+++ b/token-core/tcx-proto/src/substrate.proto
@@ -2,17 +2,7 @@ syntax = "proto3";
 package transaction;
 
 
-message SubstrateKeystoreParam {
-    string keystore = 1;
-    string password = 2;
-    string chainType = 3;
-    bool overwrite = 4;
-}
-
 
-message ExportSubstrateKeystoreResult {
-    string keystore = 1;
-}
 
 message SubstrateRawTxIn {
     string rawData = 1;
diff --git a/token-core/tcx-proto/src/tron.proto b/token-core/tcx-proto/src/tron.proto
index ec13282d..3cff2c3d 100644
--- a/token-core/tcx-proto/src/tron.proto
+++ b/token-core/tcx-proto/src/tron.proto
@@ -21,8 +21,7 @@ message TronTxOutput {
 // build the `TronMessageInput` and put it in the `input` field
 message TronMessageInput {
     string value = 1;
-    bool isHex = 2;
-    bool isTronHeader = 3;
+    bool isTronHeader = 2;
 }
 
 message TronMessageOutput {
diff --git a/token-core/tcx-substrate/Cargo.toml b/token-core/tcx-substrate/Cargo.toml
index b9019456..d9d2c18e 100644
--- a/token-core/tcx-substrate/Cargo.toml
+++ b/token-core/tcx-substrate/Cargo.toml
@@ -2,39 +2,40 @@
 name = "tcx-substrate"
 version = "0.1.0"
 authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 tcx-crypto = { path = "../tcx-crypto" }
-tcx-chain = { path = "../tcx-chain" }
+tcx-keystore = { path = "../tcx-keystore" }
 tcx-primitive = { path = "../tcx-primitive" }
 tcx-constants = { path = "../tcx-constants" }
+tcx-common = { path = "../tcx-common" }
 
-sp-core = "7.0.0"
-hex = "0.4.3"
-byteorder = "1.4.3"
+sp-core = "=7.0.0"
+byteorder = "=1.4.3"
 
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
 
-base58 = "0.2.0"
-bs58 = "0.4.0"
+base58 = "=0.2.0"
 codec = { package = "parity-scale-codec", default-features = false, features = ["derive"] }
-rand = "0.8.5"
+rand = "=0.8.5"
 
-failure = "0.1.8"
+anyhow = { version = "=1.0.79", features = [] }
 #tweetnacl = "0.2.1"
-xsalsa20poly1305 = "0.9.0"
-serde_json = "1.0.88"
-serde = { version = "1.0.147", features = ["derive"] }
-base64 = "0.13.1"
-scrypt = { version = "0.10.0", default-features = false }
-regex = "1.7.0"
+xsalsa20poly1305 = "=0.9.0"
+serde_json = "=1.0.89"
+serde = { version = "=1.0.147", features = ["derive"] }
+base64 = "=0.13.1"
+scrypt = { version = "=0.10.0", default-features = false }
+regex = "=1.9.3"
+schnorrkel = "=0.9.1"
+thiserror = "=1.0.56"
 
 
 [dev-dependencies]
-sp-runtime = "7.0.0"
-sp-keyring = "7.0.0"
+sp-runtime = "=7.0.0"
+sp-keyring = "=7.0.0"
diff --git a/token-core/tcx-substrate/src/address.rs b/token-core/tcx-substrate/src/address.rs
index 1627cc54..717ee436 100644
--- a/token-core/tcx-substrate/src/address.rs
+++ b/token-core/tcx-substrate/src/address.rs
@@ -1,15 +1,17 @@
+use anyhow::anyhow;
 use sp_core::crypto::Ss58AddressFormat;
 use sp_core::crypto::Ss58Codec;
 use sp_core::sr25519::Public;
-use tcx_chain::Address;
+use std::str::FromStr;
 use tcx_constants::{CoinInfo, Result};
+use tcx_keystore::Address;
 use tcx_primitive::{PublicKey, Sr25519PublicKey, TypedPublicKey};
 
-pub struct SubstrateAddress();
+#[derive(PartialEq, Eq, Clone)]
+pub struct SubstrateAddress(String);
 
 impl Address for SubstrateAddress {
-    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<String> {
-        // todo: TypedPublicKey to public key
+    fn from_public_key(public_key: &TypedPublicKey, coin: &CoinInfo) -> Result<Self> {
         let sr_pk = Sr25519PublicKey::from_slice(&public_key.to_bytes())?;
         let address = match coin.coin.as_str() {
             "KUSAMA" => sr_pk
@@ -18,10 +20,10 @@ impl Address for SubstrateAddress {
             "POLKADOT" => sr_pk
                 .0
                 .to_ss58check_with_version(Ss58AddressFormat::custom(0)),
-            _ => "".to_owned(),
+            _ => return Err(anyhow!("wrong_coin_type")),
         };
 
-        Ok(address)
+        Ok(SubstrateAddress(address))
     }
 
     fn is_valid(address: &str, coin: &CoinInfo) -> bool {
@@ -36,11 +38,26 @@ impl Address for SubstrateAddress {
     }
 }
 
+impl FromStr for SubstrateAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> core::result::Result<Self, Self::Err> {
+        Ok(SubstrateAddress(s.to_string()))
+    }
+}
+
+impl ToString for SubstrateAddress {
+    fn to_string(&self) -> String {
+        self.0.clone()
+    }
+}
+
 #[cfg(test)]
 mod test_super {
     use super::*;
+    use tcx_common::FromHex;
     use tcx_constants::{CoinInfo, CurveType};
-    use tcx_primitive::FromHex;
+    use tcx_primitive::{PrivateKey, Sr25519PrivateKey};
 
     #[test]
     fn test_address_from_public() {
@@ -48,7 +65,7 @@ mod test_super {
             "50780547322a1ceba67ea8c552c9bc6c686f8698ac9a8cafab7cd15a1db19859",
         )
         .unwrap();
-        let typed_key: TypedPublicKey = TypedPublicKey::Sr25519(pub_key);
+        let typed_key: TypedPublicKey = TypedPublicKey::SR25519(pub_key);
 
         let coin_infos = vec![
             (
@@ -56,7 +73,7 @@ mod test_super {
                 CoinInfo {
                     coin: "POLKADOT".to_string(),
                     derivation_path: "//imToken//polakdot/0".to_string(),
-                    curve: CurveType::SubSr25519,
+                    curve: CurveType::SR25519,
                     network: "".to_string(),
                     seg_wit: "".to_string(),
                 },
@@ -66,7 +83,7 @@ mod test_super {
                 CoinInfo {
                     coin: "KUSAMA".to_string(),
                     derivation_path: "//imToken//kusama/0".to_string(),
-                    curve: CurveType::SubSr25519,
+                    curve: CurveType::SR25519,
                     network: "".to_string(),
                     seg_wit: "".to_string(),
                 },
@@ -74,16 +91,37 @@ mod test_super {
         ];
         for addr_and_coin in coin_infos {
             let addr = SubstrateAddress::from_public_key(&typed_key, &addr_and_coin.1).unwrap();
-            assert_eq!(addr_and_coin.0, addr);
+            assert_eq!(addr.to_string(), addr_and_coin.0);
         }
+
+        let sec_key_data = &Vec::<u8>::from_hex_auto("00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd").unwrap();
+        let sec_key = Sr25519PrivateKey::from_slice(&sec_key_data).unwrap();
+        let pub_key = sec_key.public_key();
+        let typed_key = TypedPublicKey::SR25519(pub_key);
+        let mut kusama_coin_info = CoinInfo {
+            coin: "KUSAMA".to_string(),
+            derivation_path: "//imToken//kusama/0".to_string(),
+            curve: CurveType::SR25519,
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+        };
+        let addr = SubstrateAddress::from_public_key(&typed_key, &kusama_coin_info).unwrap();
+        assert_eq!(
+            addr.to_string(),
+            "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
+        );
+
+        kusama_coin_info.coin = "ERROR_TYPE".to_string();
+        let addr = SubstrateAddress::from_public_key(&typed_key, &kusama_coin_info);
+        assert_eq!(addr.err().unwrap().to_string(), "wrong_coin_type");
     }
 
     #[test]
     fn test_address_is_valid() {
-        let coin_info = CoinInfo {
+        let mut coin_info = CoinInfo {
             coin: "KUSAMA".to_string(),
             derivation_path: "//imToken//kusama/0".to_string(),
-            curve: CurveType::SubSr25519,
+            curve: CurveType::SR25519,
             network: "".to_string(),
             seg_wit: "".to_string(),
         };
@@ -95,6 +133,14 @@ mod test_super {
         for addr in addresses {
             assert!(SubstrateAddress::is_valid(addr, &coin_info));
         }
+
+        coin_info.coin = "POLKADOT".to_string();
+        coin_info.derivation_path = "//imToken//polkadot/0".to_string();
+        let addresse = "16NhUkUTkYsYRjMD22Sop2DF8MAXUsjPcYtgHF3t1ccmohx1";
+        assert!(SubstrateAddress::is_valid(addresse, &coin_info));
+
+        coin_info.coin = "ERROR_COIN_TYPE".to_string();
+        assert!(!SubstrateAddress::is_valid(addresse, &coin_info));
     }
 
     #[test]
@@ -102,7 +148,7 @@ mod test_super {
         let coin_info = CoinInfo {
             coin: "KUSAMA".to_string(),
             derivation_path: "//imToken//kusama/0".to_string(),
-            curve: CurveType::SubSr25519,
+            curve: CurveType::SR25519,
             network: "".to_string(),
             seg_wit: "".to_string(),
         };
diff --git a/token-core/tcx-substrate/src/keystore.rs b/token-core/tcx-substrate/src/keystore.rs
index d2813e57..243c16a9 100644
--- a/token-core/tcx-substrate/src/keystore.rs
+++ b/token-core/tcx-substrate/src/keystore.rs
@@ -2,29 +2,30 @@ use crate::SubstrateAddress;
 use rand::Rng;
 use serde::{de, Deserialize, Deserializer, Serialize};
 use std::convert::TryInto;
-use tcx_chain::Address;
+use tcx_keystore::{tcx_ensure, Address};
 
+use anyhow::anyhow;
 use byteorder::LittleEndian;
 use byteorder::{ReadBytesExt, WriteBytesExt};
 use regex::Regex;
+use schnorrkel::SECRET_KEY_LENGTH;
 use serde::__private::{fmt, PhantomData};
 use std::io::Cursor;
 use std::time::{SystemTime, UNIX_EPOCH};
+use tcx_common::{random_u8_32, FromHex};
 use tcx_constants::{CoinInfo, Result};
-use tcx_crypto::numberic_util::random_iv;
-use tcx_primitive::{
-    DeterministicPrivateKey, PrivateKey, PublicKey, Sr25519PrivateKey, TypedPublicKey,
-};
+use tcx_primitive::{PrivateKey, PublicKey, Sr25519PrivateKey, TypedPublicKey};
+use thiserror::Error;
 use xsalsa20poly1305::aead::{generic_array::GenericArray, Aead};
 use xsalsa20poly1305::{KeyInit, XSalsa20Poly1305};
 
-#[derive(Fail, Debug, PartialOrd, PartialEq)]
+#[derive(Error, Debug, PartialOrd, PartialEq)]
 pub enum Error {
-    #[fail(display = "invalid_keystore# {}", _0)]
+    #[error("invalid_keystore# {0}")]
     InvalidKeystore(String),
-    #[fail(display = "keystore_public_key_unmatch")]
+    #[error("keystore_public_key_unmatch")]
     KeystorePublicKeyUnmatch,
-    #[fail(display = "password_incorrect")]
+    #[error("password_incorrect")]
     PasswordIncorrect,
 }
 
@@ -133,7 +134,7 @@ fn scrypt_param_from_encoded(encoded: &[u8]) -> Result<(scrypt::Params, Vec<u8>)
 
     let inner_params = scrypt::Params::new(log_n as u8, r, p).expect("init scrypt params");
     if n != PJS_SCRYPT_N || p != PJS_SCRYPT_P || r != PJS_SCRYPT_R {
-        Err(format_err!("Pjs keystore invalid params"))
+        Err(anyhow!("pjs_scrypt_param_wrong"))
     } else {
         Ok((inner_params, salt.to_vec()))
     }
@@ -142,8 +143,8 @@ fn scrypt_param_from_encoded(encoded: &[u8]) -> Result<(scrypt::Params, Vec<u8>)
 fn default_scrypt_param() -> (scrypt::Params, Vec<u8>) {
     let log_n = ((1 << 15) as f64).log2().round();
     let param = scrypt::Params::new(log_n as u8, 8, 1).expect("init scrypt params");
-    let salt = random_iv(32);
-    (param, salt)
+    let salt = random_u8_32();
+    (param, salt.to_vec())
 }
 
 impl SubstrateKeystore {
@@ -153,11 +154,11 @@ impl SubstrateKeystore {
         pub_key: &[u8],
         addr: &str,
     ) -> Result<SubstrateKeystore> {
-        let encoding = SubstrateKeystore::encrypt(password, prv_key, pub_key)?;
+        let encoded = SubstrateKeystore::encrypt(password, prv_key, pub_key)?;
 
         Ok(SubstrateKeystore {
             address: addr.to_string(),
-            encoded: encoding.to_string(),
+            encoded,
             encoding: SubstrateKeystoreEncoding {
                 content: vec!["pkcs8".to_string(), "sr25519".to_string()],
                 encoding_type: vec!["scrypt".to_string(), "xsalsa20-poly1305".to_string()],
@@ -199,24 +200,19 @@ impl SubstrateKeystore {
 
     fn decode_cipher_text(&self) -> Result<Vec<u8>> {
         let hex_re = Regex::new(r"^(?:0[xX])?[0-9a-fA-F]+$").unwrap();
-        if self.encoding.version == "3" {
-            if !hex_re.is_match(&self.encoded) {
-                return base64::decode(&self.encoded)
-                    .map_err(|_| format_err!("decode_cipher_text"));
-            }
+        if self.encoding.version == "3" && !hex_re.is_match(&self.encoded) {
+            return base64::decode(&self.encoded).map_err(|_| anyhow!("decode_cipher_text"));
         }
 
         if self.encoded.starts_with("0x") {
-            return hex::decode(&self.encoded[2..])
-                .map_err(|_| format_err!("decode_cipher_text decode hex"));
+            Vec::from_hex(&self.encoded[2..]).map_err(|_| anyhow!("decode_cipher_text decode hex"))
         } else {
-            return hex::decode(&self.encoded)
-                .map_err(|_| format_err!("decode_cipher_text decode hex"));
+            Vec::from_hex(&self.encoded).map_err(|_| anyhow!("decode_cipher_text decode hex"))
         }
     }
 
     pub fn decrypt(&self, password: &str) -> Result<(Vec<u8>, Vec<u8>)> {
-        let _ = self.validate()?;
+        self.validate()?;
         let mut encoded = self.decode_cipher_text()?;
 
         let password_bytes = if self.encoding.version == "3"
@@ -286,8 +282,8 @@ fn encrypt_content(password: &str, plaintext: &[u8]) -> Result<String> {
     let cipher = XSalsa20Poly1305::new(key);
     let nonce = GenericArray::from_slice(&nonce_bytes);
     let encoded = cipher
-        .encrypt(&nonce, plaintext)
-        .map_err(|_e| format_err!("{}", "encrypt error"))?;
+        .encrypt(nonce, plaintext)
+        .map_err(|_e| anyhow!("{}", "encrypt error"))?;
 
     let scrypt_params_encoded = [
         salt,
@@ -297,16 +293,16 @@ fn encrypt_content(password: &str, plaintext: &[u8]) -> Result<String> {
     ]
     .concat();
     let complete_encoded: Vec<u8> = [scrypt_params_encoded, nonce_bytes.to_vec(), encoded].concat();
-    Ok(base64::encode(&complete_encoded))
+    Ok(base64::encode(complete_encoded))
 }
 
 fn gen_nonce() -> [u8; 24] {
     let mut rng = rand::thread_rng();
     let mut nonce = [0u8; 24];
 
-    for idx in 0..24 {
-        nonce[idx] = rng.gen::<u8>()
-    }
+    (0..nonce.len()).for_each(|idx| {
+        nonce[idx] = rng.gen::<u8>();
+    });
     nonce
 }
 
@@ -314,23 +310,24 @@ fn password_to_key(password_bytes: &[u8]) -> [u8; 32] {
     let mut key = [0u8; 32];
     let pwd_len = password_bytes.len();
     let iter_len = if pwd_len > 32 { 32 } else { pwd_len };
-    for idx in 0..iter_len {
-        key[idx] = password_bytes[idx]
-    }
+    key[..iter_len].copy_from_slice(&password_bytes[..iter_len]);
     key
 }
 
 pub fn decode_substrate_keystore(keystore: &SubstrateKeystore, password: &str) -> Result<Vec<u8>> {
-    let (secret_key, pub_key) = keystore.decrypt(password)?;
-    let priv_key = if secret_key.len() == 32 {
-        Sr25519PrivateKey::from_seed(&secret_key)
-    } else {
-        Sr25519PrivateKey::from_slice(&secret_key)
-    }?;
+    let (secret_key_bytes, pub_key) = keystore.decrypt(password)?;
+    tcx_ensure!(
+        secret_key_bytes.len() == SECRET_KEY_LENGTH,
+        anyhow!("secret from substrate keystore must be 64 bytes")
+    );
+
+    let priv_key = Sr25519PrivateKey::from_slice(&secret_key_bytes)?;
+
     if priv_key.public_key().to_bytes() != pub_key {
         return Err(Error::KeystorePublicKeyUnmatch.into());
     }
-    Ok(secret_key)
+
+    Ok(priv_key.to_bytes())
 }
 
 pub fn encode_substrate_keystore(
@@ -338,23 +335,24 @@ pub fn encode_substrate_keystore(
     prv_key: &[u8],
     coin: &CoinInfo,
 ) -> Result<SubstrateKeystore> {
-    let pk = Sr25519PrivateKey::from_slice(prv_key)?;
-    let pub_key = pk.public_key();
-    let addr = SubstrateAddress::from_public_key(&TypedPublicKey::Sr25519(pub_key.clone()), &coin)?;
-    SubstrateKeystore::new(password, prv_key, &pub_key.to_bytes(), &addr)
+    let sr25519_prv_key = Sr25519PrivateKey::from_slice(prv_key)?;
+    let pub_key = sr25519_prv_key.public_key();
+    let addr = SubstrateAddress::from_public_key(&TypedPublicKey::SR25519(pub_key.clone()), coin)?;
+    SubstrateKeystore::new(password, prv_key, &pub_key.to_bytes(), &addr.to_string())
 }
 
 #[cfg(test)]
 mod test_super {
     use super::*;
+    use tcx_common::{FromHex, ToHex};
     use tcx_constants::{coin_info_from_param, TEST_PASSWORD};
 
     #[test]
     fn test_decrypt_encoded() {
         let encoded = "d80bcaf72c744d5a9a6c4229280e360d98d408afbe67232c3418a2a591b3f2bf468a319b7e5c1717bb8285619a76584a7961eac2183f94cfa56ad975cb78ae87b4dc18e7c20036bd448aa52c5ee7a45c4cdf41923c8133d6bfc29c737b65dcfb357884b55fb36d4762446fb26bfd8fce49142cf0e7d3642e2095ea6e425a8e923629306875c36b72a82d517478a19c8786b1be611e77286ba6448bf93c";
-        let encoded_bytes = hex::decode(encoded).expect("encoded_bytes");
+        let encoded_bytes = Vec::from_hex(encoded).expect("encoded_bytes");
         let decrypted = decrypt_content("testing".as_bytes(), &encoded_bytes).unwrap();
-        assert_eq!(hex::encode(decrypted), "3053020101300506032b657004220420416c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4fa123032100d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f");
+        assert_eq!(decrypted.to_hex(), "3053020101300506032b657004220420416c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4fa123032100d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f");
     }
 
     const KEYSTORE_STR: &str = r#"{
@@ -380,7 +378,7 @@ mod test_super {
     fn test_decrypt_from_keystore_v2() {
         let ks: SubstrateKeystore = serde_json::from_str(KEYSTORE_STR).unwrap();
         let decrypted = decode_substrate_keystore(&ks, TEST_PASSWORD).unwrap();
-        assert_eq!(hex::encode(decrypted), "00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd");
+        assert_eq!(decrypted.to_hex(), "00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd");
         let decrypted = decode_substrate_keystore(&ks, "wrong_password");
         assert_eq!(
             format!("{}", decrypted.err().unwrap()),
@@ -416,7 +414,7 @@ mod test_super {
         assert_eq!(ks.encoding.encoding_type.len(), 2);
         assert_eq!(ks.encoding.encoding_type[0], "scrypt");
         let decrypted = decode_substrate_keystore(&ks, &TEST_PASSWORD).unwrap();
-        assert_eq!(hex::encode(decrypted), "00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd");
+        assert_eq!(decrypted.to_hex(), "00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd");
         let decrypted = decode_substrate_keystore(&ks, "wrong_password");
         assert_eq!(
             format!("{}", decrypted.err().unwrap()),
@@ -449,7 +447,7 @@ mod test_super {
                                         }"#;
         let ks: SubstrateKeystore = serde_json::from_str(keystore_str_v3_hex).unwrap();
         let decrypted = decode_substrate_keystore(&ks, "version3").unwrap();
-        assert_eq!(hex::encode(decrypted), "50f027d401a8572ff06381cf9dc633d08bd46af0d8bd6ded4ffdb4c706afdd669c80475085d55140552e00ff1fabb70be0d67c0db540c23549922b4edb4e4add");
+        assert_eq!(decrypted.to_hex(), "50f027d401a8572ff06381cf9dc633d08bd46af0d8bd6ded4ffdb4c706afdd669c80475085d55140552e00ff1fabb70be0d67c0db540c23549922b4edb4e4add");
         let decrypted = decode_substrate_keystore(&ks, "wrong_password");
         assert_eq!(
             format!("{}", decrypted.err().unwrap()),
@@ -459,7 +457,7 @@ mod test_super {
 
     #[test]
     fn test_export_from_secret_key() {
-        let prv_key = hex::decode("00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd").unwrap();
+        let prv_key = Vec::from_hex("00ea01b0116da6ca425c477521fd49cc763988ac403ab560f4022936a18a4341016e7df1f5020068c9b150e0722fea65a264d5fbb342d4af4ddf2f1cdbddf1fd").unwrap();
         let coin_info = coin_info_from_param("KUSAMA", "", "", "").unwrap();
         let keystore = encode_substrate_keystore(&TEST_PASSWORD, &prv_key, &coin_info).unwrap();
         assert_eq!(
@@ -476,8 +474,80 @@ mod test_super {
     }
 
     #[test]
-    fn is_valid_keystore() {
-        let keystore: SubstrateKeystore = serde_json::from_str(KEYSTORE_STR).unwrap();
-        assert!(keystore.validate().is_ok())
+    fn test_is_valid_keystore() {
+        let mut keystore: SubstrateKeystore = serde_json::from_str(KEYSTORE_STR).unwrap();
+        assert!(keystore.validate().is_ok());
+
+        let address = keystore.address.clone();
+        let encoded = keystore.encoded.clone();
+        let content_pkcs8 = keystore.encoding.content[0].clone();
+        let content_sr25519 = keystore.encoding.content[1].clone();
+        keystore.address = "".to_string();
+        let result = keystore.validate();
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_keystore# address is empty".to_string()
+        );
+        keystore.address = address;
+
+        keystore.encoded = "".to_string();
+        let result = keystore.validate();
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_keystore# encoded is empty"
+        );
+        keystore.encoded = encoded;
+
+        keystore.encoding.content[0] = "wrong_content".to_string();
+        let result = keystore.validate();
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_keystore# need pkcs8 padding"
+        );
+        keystore.encoding.content[0] = content_pkcs8;
+
+        keystore.encoding.content[1] = "wrong_content".to_string();
+        let result = keystore.validate();
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_keystore# only support sr25519"
+        );
+        keystore.encoding.content[1] = content_sr25519;
+
+        keystore.encoding.version = "0".to_string();
+        let result = keystore.validate();
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_keystore# only support version 2 or 3"
+        );
+    }
+
+    #[test]
+    fn test_decode_cipher_text() {
+        let keystore_str = r#"{
+            "address": "FLiSDPCcJ6auZUGXALLj6jpahcP6adVFDBUQznPXUQ7yoqH",
+            "encoded": "cd238963070cc4d6806053ee1ac500c7add9c28732bb5d434a332f84a91d9be0008000000100000008000000cf630a1113941b350ddd06697e50399183162e5e9a0e893eafc7f5f4893a223dca5055706b9925b56fdb4304192143843da718e11717daf89cf4f4781f94fb443f61432f782d54280af9eec90bd3069c3cc2d957a42b7c18dc2e9497f623735518e0e49b58f8e4db2c09da3a45dbb935659d015fc94b946cba75b606a6ff7f4e823f6b049e2e6892026b49de02d6dbbd64646fe0933f537d9ea53a70be",
+            "encoding": {
+              "content": [
+                "pkcs8",
+                "sr25519"
+              ],
+              "type": [
+                "scrypt",
+                "xsalsa20-poly1305"
+              ],
+              "version": "3"
+            },
+            "meta": {
+              "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
+              "name": "version3",
+              "tags": [],
+              "whenCreated": 1595277797639
+            }
+          }"#;
+        let ks: SubstrateKeystore = serde_json::from_str(keystore_str).unwrap();
+        let decode_result = ks.decode_cipher_text().unwrap();
+        let result_hex = decode_result.to_hex();
+        assert_eq!(result_hex, "cd238963070cc4d6806053ee1ac500c7add9c28732bb5d434a332f84a91d9be0008000000100000008000000cf630a1113941b350ddd06697e50399183162e5e9a0e893eafc7f5f4893a223dca5055706b9925b56fdb4304192143843da718e11717daf89cf4f4781f94fb443f61432f782d54280af9eec90bd3069c3cc2d957a42b7c18dc2e9497f623735518e0e49b58f8e4db2c09da3a45dbb935659d015fc94b946cba75b606a6ff7f4e823f6b049e2e6892026b49de02d6dbbd64646fe0933f537d9ea53a70be");
     }
 }
diff --git a/token-core/tcx-substrate/src/lib.rs b/token-core/tcx-substrate/src/lib.rs
index 41481aa4..f25ff491 100644
--- a/token-core/tcx-substrate/src/lib.rs
+++ b/token-core/tcx-substrate/src/lib.rs
@@ -5,13 +5,18 @@ mod transaction;
 
 pub use address::SubstrateAddress;
 pub use keystore::{decode_substrate_keystore, encode_substrate_keystore, SubstrateKeystore};
-pub use transaction::{
-    ExportSubstrateKeystoreResult, SubstrateKeystoreParam, SubstrateRawTxIn, SubstrateTxOut,
-};
+pub use transaction::{SubstrateRawTxIn, SubstrateTxOut};
 
 pub(crate) const SIGNATURE_TYPE_SR25519: u8 = 0x01;
 pub(crate) const PAYLOAD_HASH_THRESHOLD: usize = 256;
 
-#[macro_use]
-extern crate failure;
 extern crate serde_json;
+
+pub mod polkadot {
+
+    pub const CHAINS: [&str; 2] = ["POLKADOT", "KUSAMA"];
+
+    pub type Address = crate::SubstrateAddress;
+    pub type TransactionInput = crate::transaction::SubstrateRawTxIn;
+    pub type TransactionOutput = crate::transaction::SubstrateTxOut;
+}
diff --git a/token-core/tcx-substrate/src/signer.rs b/token-core/tcx-substrate/src/signer.rs
index 20350689..4849e59d 100644
--- a/token-core/tcx-substrate/src/signer.rs
+++ b/token-core/tcx-substrate/src/signer.rs
@@ -2,12 +2,16 @@ use crate::transaction::{SubstrateRawTxIn, SubstrateTxOut};
 use crate::{PAYLOAD_HASH_THRESHOLD, SIGNATURE_TYPE_SR25519};
 use sp_core::blake2_256;
 
-use tcx_chain::{ChainSigner, Keystore, TransactionSigner as TraitTransactionSigner};
+use tcx_common::{FromHex, ToHex};
 use tcx_constants::Result;
+use tcx_keystore::{
+    Keystore, SignatureParameters, Signer, TransactionSigner as TraitTransactionSigner,
+};
 
+// Ref: https://github.com/paritytech/txwrapper-core/blob/8c7c9e16ab877f0247e547ee6368e22e5579b492/packages/txwrapper-core/src/core/construct/createSigningPayload.ts#L37-L42
 pub(crate) fn hash_unsigned_payload(payload: &[u8]) -> Result<Vec<u8>> {
     if payload.len() > PAYLOAD_HASH_THRESHOLD {
-        Ok(blake2_256(&payload).to_vec())
+        Ok(blake2_256(payload).to_vec())
     } else {
         Ok(payload.to_vec())
     }
@@ -16,8 +20,7 @@ pub(crate) fn hash_unsigned_payload(payload: &[u8]) -> Result<Vec<u8>> {
 impl TraitTransactionSigner<SubstrateRawTxIn, SubstrateTxOut> for Keystore {
     fn sign_transaction(
         &mut self,
-        symbol: &str,
-        address: &str,
+        params: &SignatureParameters,
         tx: &SubstrateRawTxIn,
     ) -> Result<SubstrateTxOut> {
         let raw_data_bytes = if tx.raw_data.starts_with("0x") {
@@ -25,15 +28,15 @@ impl TraitTransactionSigner<SubstrateRawTxIn, SubstrateTxOut> for Keystore {
         } else {
             tx.raw_data.clone()
         };
-        let raw_data_bytes = hex::decode(&raw_data_bytes)?;
+        let raw_data_bytes = Vec::from_hex(raw_data_bytes)?;
         let hash = hash_unsigned_payload(&raw_data_bytes)?;
 
-        let sig = self.sign_recoverable_hash(&hash, symbol, address, None)?;
+        let sig = self.sr25519_sign(&hash, &params.derivation_path)?;
 
         let sig_with_type = [vec![SIGNATURE_TYPE_SR25519], sig].concat();
 
         let tx_out = SubstrateTxOut {
-            signature: format!("0x{}", hex::encode(sig_with_type)),
+            signature: sig_with_type.to_0x_hex(),
         };
         Ok(tx_out)
     }
@@ -42,23 +45,17 @@ impl TraitTransactionSigner<SubstrateRawTxIn, SubstrateTxOut> for Keystore {
 #[cfg(test)]
 mod test_super {
     use super::*;
+    use tcx_common::ToHex;
 
     #[test]
     fn test_payload_hash() {
         let test_cases = vec![
             ("imToken", "696d546f6b656e"),
-            ("super long sentence: 0x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA79883", "7375706572206c6f6e672073656e74656e63653a20307838393144383533383041323237653561383434336264306633396244656442423644413739383833307838393144383533383041323237653561383434336264306633396244656442423644413739383833307838393144383533383041323237653561383434336264306633396244656442423644413739383833307838393144383533383041323237653561383434336264306633396244656442423644413739383833307838393144383533383041323237653561383434336264306633396244656442423644413739383833")
+            ("super long sentence: 0x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA79883 0x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA798830x891D85380A227e5a8443bd0f39bDedBB6DA79883", "32c9e41866cb31a30fa2caf28f1b35b1cc8f526bb5765b54f410c68bd59ee7a2"),
          ];
         for case in test_cases {
-            assert_eq!(
-                case.1,
-                hex::encode(hash_unsigned_payload(case.0.as_bytes()).unwrap())
-            );
+            let hash = hash_unsigned_payload(case.0.as_bytes()).unwrap();
+            assert_eq!(case.1, hash.to_hex());
         }
     }
-
-    #[test]
-    fn test_sign() {
-        // check the integration test
-    }
 }
diff --git a/token-core/tcx-substrate/src/transaction.rs b/token-core/tcx-substrate/src/transaction.rs
index bb750070..dbca51f7 100644
--- a/token-core/tcx-substrate/src/transaction.rs
+++ b/token-core/tcx-substrate/src/transaction.rs
@@ -1,23 +1,5 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SubstrateKeystoreParam {
-    #[prost(string, tag = "1")]
-    pub keystore: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub password: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub chain_type: ::prost::alloc::string::String,
-    #[prost(bool, tag = "4")]
-    pub overwrite: bool,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ExportSubstrateKeystoreResult {
-    #[prost(string, tag = "1")]
-    pub keystore: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SubstrateRawTxIn {
     #[prost(string, tag = "1")]
     pub raw_data: ::prost::alloc::string::String,
diff --git a/token-core/tcx-tester/Cargo.toml b/token-core/tcx-tester/Cargo.toml
index 11a179c6..02c9ce80 100644
--- a/token-core/tcx-tester/Cargo.toml
+++ b/token-core/tcx-tester/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-hex = "0.4.3"
+hex = "=0.4.3"
 tcx = { path = "../tcx" }
-prost = "0.11.2"
-bytes = "1.3.0"
\ No newline at end of file
+prost = "=0.11.2"
+bytes = "=1.4.0"
\ No newline at end of file
diff --git a/token-core/tcx-tester/src/main.rs b/token-core/tcx-tester/src/main.rs
index 93463833..d47dd21d 100644
--- a/token-core/tcx-tester/src/main.rs
+++ b/token-core/tcx-tester/src/main.rs
@@ -29,8 +29,8 @@ fn main() {
 
     let args: Vec<String> = env::args().collect();
     let hex = &args[1];
-    // let bytes = hex::decode(hex).expect("decode hex");
+    // let bytes = Vec::from_hex(hex).expect("decode hex");
     // let param_buf = wrap_buffer(bytes);
-    unsafe { call_tcx_api(_to_c_char(&hex)) };
+    unsafe { call_tcx_api(_to_c_char(hex)) };
     unsafe { get_last_err_message() };
 }
diff --git a/token-core/tcx-tezos/Cargo.toml b/token-core/tcx-tezos/Cargo.toml
index ee8ab629..9c9ae609 100644
--- a/token-core/tcx-tezos/Cargo.toml
+++ b/token-core/tcx-tezos/Cargo.toml
@@ -2,21 +2,21 @@
 name = "tcx-tezos"
 version = "0.1.0"
 authors = ["xiaoguang <xiaoguang101010@163.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tcx-chain = { path = "../tcx-chain" }
+tcx-keystore = { path = "../tcx-keystore" }
 tcx-constants = { path = "../tcx-constants" }
 tcx-primitive = { path = "../tcx-primitive" }
 tcx-crypto = { path = "../tcx-crypto" }
+tcx-common = { path = "../tcx-common" }
 
-blake2b_simd = "1.0.0"
-hex = "0.4.3"
-bitcoin = "0.29.2"
-ring = "0.16.20"
-
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
\ No newline at end of file
+anyhow = { version = "=1.0.79", features = [] }
+blake2b_simd = "=1.0.1"
+hex = "=0.4.3"
+bitcoin = "=0.29.2"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
\ No newline at end of file
diff --git a/token-core/tcx-tezos/src/address.rs b/token-core/tcx-tezos/src/address.rs
index ec09b32d..c0d5521d 100644
--- a/token-core/tcx-tezos/src/address.rs
+++ b/token-core/tcx-tezos/src/address.rs
@@ -1,15 +1,35 @@
 use bitcoin::util::base58;
 use blake2b_simd::Params;
-use tcx_chain::Address;
-use tcx_chain::Result;
+use std::str::FromStr;
+use tcx_common::{sha256, sha256d};
 use tcx_constants::CoinInfo;
+use tcx_keystore::Address;
+use tcx_keystore::PublicKeyEncoder;
+use tcx_keystore::Result;
 use tcx_primitive::TypedPublicKey;
 
-pub struct TezosAddress();
+use tcx_common::FromHex;
+
+#[derive(PartialEq, Eq, Clone)]
+pub struct TezosPublicKeyEncoder {}
+
+impl PublicKeyEncoder for TezosPublicKeyEncoder {
+    fn encode(public_key: &TypedPublicKey, _coin_info: &CoinInfo) -> Result<String> {
+        let edpk_prefix: Vec<u8> = vec![0x0D, 0x0F, 0x25, 0xD9];
+        let to_hash = [edpk_prefix, public_key.to_bytes()].concat();
+        let hashed = sha256d(&to_hash);
+        let hash_with_checksum = [to_hash, hashed[0..4].to_vec()].concat();
+        let edpk = base58::encode_slice(&hash_with_checksum);
+        Ok(edpk)
+    }
+}
+
+#[derive(PartialEq, Eq, Clone)]
+pub struct TezosAddress(String);
 
 impl Address for TezosAddress {
-    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<String> {
-        let tz1_prefix = hex::decode("06A19F")?;
+    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<Self> {
+        let tz1_prefix = Vec::from_hex("06A19F")?;
         //get public key
         let pubkey = public_key.to_bytes();
         //Perform Blake2B hashing on the public key（no prefix）
@@ -20,12 +40,12 @@ impl Address for TezosAddress {
         let mut prefixed_generic_hash = vec![];
         prefixed_generic_hash.extend_from_slice(tz1_prefix.as_ref());
         prefixed_generic_hash.extend_from_slice(generic_hash.as_bytes());
-        let double_hash_result = sha256_hash(&sha256_hash(&prefixed_generic_hash));
+        let double_hash_result = sha256(&sha256(&prefixed_generic_hash));
         prefixed_generic_hash.extend_from_slice(&double_hash_result[..4]);
         //base58Encode(prefix<3> + public key hash<20> + checksum<4>)
         let address = base58::encode_slice(prefixed_generic_hash.as_slice());
 
-        Ok(address)
+        Ok(TezosAddress(address))
     }
 
     fn is_valid(address: &str, _coin: &CoinInfo) -> bool {
@@ -35,7 +55,7 @@ impl Address for TezosAddress {
         };
 
         let decode_data = decode_result.unwrap();
-        let hash_res = sha256_hash(&sha256_hash(&decode_data[..decode_data.len() - 4]));
+        let hash_res = sha256(&sha256(&decode_data[..decode_data.len() - 4]));
         for number in 0..4 {
             if hash_res[number] != decode_data[decode_data.len() - 4 + number] {
                 return false;
@@ -45,18 +65,26 @@ impl Address for TezosAddress {
     }
 }
 
-use ring::digest;
+impl ToString for TezosAddress {
+    fn to_string(&self) -> String {
+        self.0.clone()
+    }
+}
 
-pub fn sha256_hash(data: &[u8]) -> Vec<u8> {
-    let digest_obj = digest::digest(&digest::SHA256, data);
-    digest_obj.as_ref().to_vec()
+impl FromStr for TezosAddress {
+    type Err = anyhow::Error;
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(TezosAddress(s.to_string()))
+    }
 }
 
 #[cfg(test)]
 mod test {
+
     use crate::address::TezosAddress;
-    use tcx_chain::Address;
+    use hex::FromHex;
     use tcx_constants::{CoinInfo, CurveType};
+    use tcx_keystore::Address;
     use tcx_primitive::TypedPublicKey;
 
     #[test]
@@ -71,25 +99,29 @@ mod test {
 
         let pub_key = TypedPublicKey::from_slice(
             CurveType::ED25519,
-            &hex::decode("4a501efd328e062c8675f2365970728c859c592beeefd6be8ead3d901330bc01")
+            &Vec::from_hex("4a501efd328e062c8675f2365970728c859c592beeefd6be8ead3d901330bc01")
                 .unwrap(),
         )
         .unwrap();
         assert_eq!(
-            TezosAddress::from_public_key(&pub_key, &coin_info).unwrap(),
+            TezosAddress::from_public_key(&pub_key, &coin_info)
+                .unwrap()
+                .to_string(),
             "tz1dLEU3WfzCrDq2bvoEz4cfLP5wg4S7xNo9"
         );
 
         let pub_key = TypedPublicKey::from_slice(
             CurveType::ED25519,
-            &hex::decode("d0c5ee97112a8a6f192ec44ab10f6a51bbfa327f7736e8e8b30b9ec636bc533b")
+            &Vec::from_hex("d0c5ee97112a8a6f192ec44ab10f6a51bbfa327f7736e8e8b30b9ec636bc533b")
                 .unwrap(),
         )
         .unwrap();
-        //tz1MSaHcwz8vqQKTq9YsxZWfM5PhqFLB2B17
-        println!(
-            "###->{}",
-            TezosAddress::from_public_key(&pub_key, &coin_info).unwrap()
+
+        assert_eq!(
+            TezosAddress::from_public_key(&pub_key, &coin_info)
+                .unwrap()
+                .to_string(),
+            "tz1KenEed7WbMRsNUBv24vnCzVgbdrvy44cr"
         );
     }
 
@@ -102,12 +134,40 @@ mod test {
             network: "MAINNET".to_string(),
             seg_wit: "".to_string(),
         };
-        let address = "tz1dLEU3WfzCrDq2bvoEz4cfLP5wg4S7xNo9";
+        let address = "tz1dLEU3WfzCrDq2bvoEz4cfLP5wg4S7xNo9"; //valid address
         let valid_result = TezosAddress::is_valid(address, &coin_info);
         assert!(valid_result);
 
-        let address = "tz1dLEU3WfzCrDq2bvoEz4cfLP5wg4S7xNoI";
+        let address = "tz1dLEU3WfzCrDq2bvoEz4cfLP5wg4S7xNoI"; //base58 error address
+        let valid_result = TezosAddress::is_valid(address, &coin_info);
+        assert!(!valid_result);
+
+        let address = "tz1dLEU3WfzCrDq2bvoEz4cfLP5wg4S3DxBZ"; //checksum error address
         let valid_result = TezosAddress::is_valid(address, &coin_info);
-        assert_eq!(false, valid_result);
+        assert!(!valid_result);
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let coin_info = CoinInfo {
+            coin: "TEZOS".to_string(),
+            derivation_path: "".to_string(),
+            curve: CurveType::ED25519,
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+        };
+
+        let pub_key = TypedPublicKey::from_slice(
+            CurveType::ED25519,
+            &Vec::from_hex("fe157cc8011727936c592f856c9071d39cf4acdadfa6d76435e4619c9dc56f63")
+                .unwrap(),
+        )
+        .unwrap();
+        assert_eq!(
+            TezosAddress::from_public_key(&pub_key, &coin_info)
+                .unwrap()
+                .to_string(),
+            "tz1cG2jx3W4bZFeVGBjsTxUAG8tdpTXtE8PT"
+        );
     }
 }
diff --git a/token-core/tcx-tezos/src/lib.rs b/token-core/tcx-tezos/src/lib.rs
index b698baee..4e64930a 100644
--- a/token-core/tcx-tezos/src/lib.rs
+++ b/token-core/tcx-tezos/src/lib.rs
@@ -2,38 +2,50 @@ pub mod address;
 pub mod signer;
 pub mod transaction;
 use bitcoin::util::base58;
-use tcx_chain::Result;
+use tcx_common::FromHex;
+use tcx_keystore::Result;
 use tcx_primitive::{Ed25519PrivateKey, PrivateKey, PublicKey};
 
-pub fn build_tezos_base58_private_key(sk: &str) -> Result<String> {
+pub fn encode_tezos_private_key(sk: &str) -> Result<String> {
     //tezos private key prefix
     let edsk_prefix: [u8; 4] = [43, 246, 78, 7];
 
-    //prefix + public key + public key
+    //prefix + private key + public key
     let mut prefixed_sec_key_vec = vec![];
     prefixed_sec_key_vec.extend(&edsk_prefix);
     let ed25519_private_key =
-        Ed25519PrivateKey::from_slice(hex::decode(sk).unwrap().as_slice()).unwrap();
+        Ed25519PrivateKey::from_slice(Vec::from_hex(sk).unwrap().as_slice()).unwrap();
     prefixed_sec_key_vec.extend(&ed25519_private_key.to_bytes());
     prefixed_sec_key_vec.extend(&ed25519_private_key.public_key().to_bytes());
 
     Ok(base58::check_encode_slice(prefixed_sec_key_vec.as_slice()))
 }
 
-pub fn pars_tezos_private_key(private_key: &str) -> Result<Vec<u8>> {
+pub fn parse_tezos_private_key(private_key: &str) -> Result<Vec<u8>> {
     let data = base58::from_check(private_key)?;
-    let pk = Ed25519PrivateKey::from_slice(&data[4..36])?;
-    Ok(pk.to_bytes())
+    let sec_key = Ed25519PrivateKey::from_slice(&data[4..36])?;
+    Ok(sec_key.to_bytes())
+}
+
+pub mod tezos {
+
+    pub const CHAINS: [&str; 1] = ["TEZOS"];
+
+    pub type Address = crate::address::TezosAddress;
+    pub type TransactionInput = crate::transaction::TezosRawTxIn;
+    pub type TransactionOutput = crate::transaction::TezosTxOut;
+    pub type PubKeyEncoder = crate::address::TezosPublicKeyEncoder;
 }
 
 #[cfg(test)]
 mod tests {
 
-    use crate::{build_tezos_base58_private_key, pars_tezos_private_key};
+    use crate::{encode_tezos_private_key, parse_tezos_private_key};
+    use tcx_common::ToHex;
 
     #[test]
     fn test_build_tezos_private_key() {
-        let base58_prikey = build_tezos_base58_private_key(
+        let base58_prikey = encode_tezos_private_key(
             "5740dedadb610333de66ef2db2d91fd648fcbe419dff766f921ae97d536f94ce",
         )
         .unwrap();
@@ -43,9 +55,9 @@ mod tests {
     #[test]
     fn test_pars_tezos_private_key() {
         let tezos_base58_sk = "edskRoRrqsGXLTjMwAtzLSx8G7s9ipibZQh6ponFhZYSReSwxwPo7qJCkPJoRjdUhz8Hj7uZhZaFp7F5yftHUYBpJwF2ZY6vAc";
-        let parsing_result = pars_tezos_private_key(tezos_base58_sk).unwrap();
+        let parsing_result = parse_tezos_private_key(tezos_base58_sk).unwrap();
         assert_eq!(
-            hex::encode(parsing_result),
+            parsing_result.to_hex(),
             "5740dedadb610333de66ef2db2d91fd648fcbe419dff766f921ae97d536f94ce".to_string()
         );
     }
diff --git a/token-core/tcx-tezos/src/signer.rs b/token-core/tcx-tezos/src/signer.rs
index d442b117..aa438288 100644
--- a/token-core/tcx-tezos/src/signer.rs
+++ b/token-core/tcx-tezos/src/signer.rs
@@ -1,14 +1,16 @@
 use crate::transaction::{TezosRawTxIn, TezosTxOut};
 use bitcoin::util::base58;
 use blake2b_simd::Params;
-use tcx_chain::{ChainSigner, Keystore, TransactionSigner as TraitTransactionSigner};
+use tcx_common::{FromHex, ToHex};
 use tcx_constants::Result;
+use tcx_keystore::{
+    Keystore, SignatureParameters, Signer, TransactionSigner as TraitTransactionSigner,
+};
 
 impl TraitTransactionSigner<TezosRawTxIn, TezosTxOut> for Keystore {
     fn sign_transaction(
         &mut self,
-        symbol: &str,
-        address: &str,
+        params: &SignatureParameters,
         tx: &TezosRawTxIn,
     ) -> Result<TezosTxOut> {
         let raw_data_bytes = if tx.raw_data.starts_with("0x") {
@@ -18,14 +20,19 @@ impl TraitTransactionSigner<TezosRawTxIn, TezosTxOut> for Keystore {
         };
 
         //Blake2b hash
-        let mut params = Params::new();
-        params.hash_length(32);
+        let mut blake2b_params = Params::new();
+        blake2b_params.hash_length(32);
         //add watermark https://gitlab.com/tezos/tezos/-/issues/199
+        // https://tezos.gitlab.io/user/key-management.html#signer-requests
         let mut hash_message: Vec<u8> = vec![0x03];
-        hash_message.extend(hex::decode(&raw_data_bytes)?.as_slice());
-        let hash_result = params.hash(hash_message.as_slice());
-        let sign_result =
-            self.sign_recoverable_hash(hash_result.as_bytes(), symbol, address, None)?;
+        hash_message.extend(Vec::from_hex(raw_data_bytes)?.as_slice());
+        let hash_result = blake2b_params.hash(hash_message.as_slice());
+        let sign_result = self.sign_hash(
+            hash_result.as_bytes(),
+            &params.derivation_path,
+            "ed25519",
+            "",
+        )?;
 
         //tezos ed25519 signature prefix
         let edsig_prefix: [u8; 5] = [9, 245, 205, 134, 18];
@@ -33,7 +40,7 @@ impl TraitTransactionSigner<TezosRawTxIn, TezosTxOut> for Keystore {
         edsig_source_data.extend(&edsig_prefix);
         edsig_source_data.extend(sign_result.as_slice());
 
-        let sign_result_hex = hex::encode(sign_result);
+        let sign_result_hex = sign_result.to_hex();
         let tx_out = TezosTxOut {
             signature: sign_result_hex.clone(),
             edsig: base58::check_encode_slice(edsig_source_data.as_slice()),
diff --git a/token-core/tcx-tron/Cargo.toml b/token-core/tcx-tron/Cargo.toml
index d868cf6a..91c450c3 100644
--- a/token-core/tcx-tron/Cargo.toml
+++ b/token-core/tcx-tron/Cargo.toml
@@ -2,32 +2,32 @@
 name = "tcx-tron"
 version = "0.1.0"
 authors = ["tyrone <2125081@qq.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 tcx-crypto = { path = "../tcx-crypto" }
-tcx-chain = { path = "../tcx-chain" }
+tcx-keystore = { path = "../tcx-keystore" }
 tcx-primitive = { path = "../tcx-primitive" }
 tcx-constants = { path = "../tcx-constants" }
+tcx-common = { path = "../tcx-common" }
 
-prost = "0.11.2"
-bytes = "1.3.0"
+prost = "=0.11.2"
+bytes = "=1.4.0"
 
-hex-literal = "0.3.4"
-bitcoin = "0.29.2"
-secp256k1 = {version ="0.24.1", features = ["rand", "recovery"] }
-tiny-bip39 = "0.7.3"
-bitcoin_hashes = "0.11.0"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.88"
-uuid = { version = "1.2.2", features = ["serde", "v4"] }
-failure = "0.1.8"
-num-bigint = "0.4"
-num-traits = "0.2"
-num-integer = "0.1"
-byteorder = "1.4.3"
-bytebuffer = "0.2.1"
-hex = "0.4.3"
-sha3 = "0.10.6"
-digest = "0.10.6"
+hex-literal = "=0.3.4"
+bitcoin = "=0.29.2"
+secp256k1 = {version = "=0.24.3", features = ["rand", "recovery"] }
+tiny-bip39 = "=1.0.0"
+bitcoin_hashes = "=0.11.0"
+serde = { version = "=1.0.147", features = ["derive"] }
+serde_json = "=1.0.89"
+uuid = { version = "=1.2.2", features = ["serde", "v4"] }
+anyhow = { version = "=1.0.79", features = [] }
+num-bigint = "=0.4.3"
+num-traits = "=0.2.15"
+num-integer = "=0.1.45"
+byteorder = "=1.4.3"
+bytebuffer = "=0.2.1"
+hex = "=0.4.3"
+digest = "=0.10.6"
 
diff --git a/token-core/tcx-tron/src/address.rs b/token-core/tcx-tron/src/address.rs
index 942da9f5..3bda9feb 100644
--- a/token-core/tcx-tron/src/address.rs
+++ b/token-core/tcx-tron/src/address.rs
@@ -1,22 +1,24 @@
 use bitcoin::util::base58;
+use core::str::FromStr;
 
-use crate::keccak;
+use tcx_common::keccak256;
 
-use tcx_chain::Address as TraitAddress;
-use tcx_chain::Result;
 use tcx_constants::CoinInfo;
+use tcx_keystore::Address;
+use tcx_keystore::Result;
 use tcx_primitive::TypedPublicKey;
 
-pub struct Address(pub String);
+#[derive(PartialEq, Eq, Clone)]
+pub struct TronAddress(pub String);
 
-impl TraitAddress for Address {
-    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<String> {
+impl Address for TronAddress {
+    fn from_public_key(public_key: &TypedPublicKey, _coin: &CoinInfo) -> Result<Self> {
         let pk = public_key.as_secp256k1()?;
         let bytes = pk.to_uncompressed();
 
-        let hash = keccak(&bytes[1..]);
+        let hash = keccak256(&bytes[1..]);
         let hex: Vec<u8> = [vec![0x41], hash[12..32].to_vec()].concat();
-        Ok(base58::check_encode_slice(&hex))
+        Ok(TronAddress(base58::check_encode_slice(&hex)))
     }
 
     fn is_valid(address: &str, _coin: &CoinInfo) -> bool {
@@ -29,17 +31,35 @@ impl TraitAddress for Address {
     }
 }
 
+impl FromStr for TronAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(TronAddress(s.to_string()))
+    }
+}
+
+impl ToString for TronAddress {
+    fn to_string(&self) -> String {
+        self.0.clone()
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    use std::str::FromStr;
+
     use super::Address;
-    use tcx_chain::Address as TraitAddress;
+    use crate::TronAddress;
+    use tcx_common::FromHex;
     use tcx_constants::coin_info::coin_info_from_param;
-    use tcx_constants::{CoinInfo, CurveType};
-    use tcx_primitive::TypedPublicKey;
+    use tcx_constants::{CoinInfo, CurveType, TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_keystore::{Keystore, Metadata};
+    use tcx_primitive::{TypedPrivateKey, TypedPublicKey};
 
     #[test]
     fn tron_address() {
-        let bytes = hex::decode("04DAAC763B1B3492720E404C53D323BAF29391996F7DD5FA27EF0D12F7D50D694700684A32AD97FF4C09BF9CF0B9D0AC7F0091D9C6CB8BE9BB6A1106DA557285D8").unwrap();
+        let bytes = Vec::from_hex("04DAAC763B1B3492720E404C53D323BAF29391996F7DD5FA27EF0D12F7D50D694700684A32AD97FF4C09BF9CF0B9D0AC7F0091D9C6CB8BE9BB6A1106DA557285D8").unwrap();
         let coin_info = CoinInfo {
             coin: "".to_string(),
             derivation_path: "".to_string(),
@@ -49,11 +69,12 @@ mod tests {
         };
 
         assert_eq!(
-            Address::from_public_key(
+            TronAddress::from_public_key(
                 &TypedPublicKey::from_slice(CurveType::SECP256k1, &bytes).unwrap(),
                 &coin_info
             )
-            .unwrap(),
+            .unwrap()
+            .to_string(),
             "THfuSDVRvSsjNDPFdGjMU19Ha4Kf7acotq"
         );
     }
@@ -61,21 +82,71 @@ mod tests {
     #[test]
     fn tron_address_validation() {
         let coin_info = coin_info_from_param("TRON", "", "", "").unwrap();
-        assert!(Address::is_valid(
+        assert!(TronAddress::is_valid(
             "THfuSDVRvSsjNDPFdGjMU19Ha4Kf7acotq",
             &coin_info
         ));
-        assert!(!Address::is_valid(
+        assert!(!TronAddress::is_valid(
             "THfuSDVRvSsjNDPFdGjMU19Ha4Kf7acot",
             &coin_info
         ));
-        assert!(!Address::is_valid(
+        assert!(!TronAddress::is_valid(
             "qq9j7zsvxxl7qsrtpnxp8q0ahcc3j3k6mss7mnlrj8",
             &coin_info
         ));
-        assert!(!Address::is_valid(
+        assert!(!TronAddress::is_valid(
             "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN",
             &coin_info
         ));
     }
+
+    #[test]
+    fn test_address_from_str() {
+        let tezos_address = TronAddress::from_str("THfuSDVRvSsjNDPFdGjMU19Ha4Kf7acotq").unwrap();
+        assert_eq!(
+            tezos_address.to_string(),
+            "THfuSDVRvSsjNDPFdGjMU19Ha4Kf7acotq"
+        );
+    }
+
+    #[test]
+    fn test_derive_address() {
+        let coin_info = coin_info_from_param("TRON", "", "", "").unwrap();
+        let mut keystore =
+            Keystore::from_mnemonic(&TEST_MNEMONIC, &TEST_PASSWORD, Metadata::default()).unwrap();
+        keystore.unlock_by_password(&TEST_PASSWORD).unwrap();
+
+        let acc = keystore.derive_coin::<TronAddress>(&coin_info).unwrap();
+        assert_eq!(acc.address, "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2");
+    }
+
+    #[test]
+    fn cross_test_tw() {
+        let prv_str = "2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let coin_info = CoinInfo {
+            coin: "BITCOINCASH".to_string(),
+            derivation_path: "m/44'/2'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1,
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+        };
+        let address = TronAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+
+        let prv_str = "BE88DF1D0BF30A923CB39C3BB953178BAAF3726E8D3CE81E7C8462E046E0D835";
+        let pub_key =
+            TypedPrivateKey::from_slice(CurveType::SECP256k1, &Vec::from_hex(prv_str).unwrap())
+                .unwrap()
+                .public_key();
+        let address = TronAddress::from_public_key(&pub_key, &coin_info)
+            .unwrap()
+            .to_string();
+        assert_eq!(address, "THRF3GuPnvvPzKoaT8pJex5XHmo8NNbCb3");
+    }
 }
diff --git a/token-core/tcx-tron/src/lib.rs b/token-core/tcx-tron/src/lib.rs
index 076d8e5f..9eb14237 100644
--- a/token-core/tcx-tron/src/lib.rs
+++ b/token-core/tcx-tron/src/lib.rs
@@ -2,12 +2,17 @@ pub mod address;
 pub mod signer;
 pub mod transaction;
 
-pub use crate::address::Address as TrxAddress;
+pub use crate::address::TronAddress;
 
-use sha3::{Digest, Keccak256, Sha3_256};
+pub mod tron {
 
-pub fn keccak(bytes: &[u8]) -> Vec<u8> {
-    let mut hasher = Keccak256::new();
-    hasher.update(bytes);
-    hasher.finalize().to_vec()
+    pub const CHAINS: [&str; 1] = ["TRON"];
+
+    pub type Address = crate::address::TronAddress;
+    pub type TransactionInput = crate::transaction::TronTxInput;
+    pub type TransactionOutput = crate::transaction::TronTxOutput;
+
+    pub type MessageInput = crate::transaction::TronMessageInput;
+
+    pub type MessageOutput = crate::transaction::TronMessageOutput;
 }
diff --git a/token-core/tcx-tron/src/signer.rs b/token-core/tcx-tron/src/signer.rs
index d5d75448..37dc2635 100644
--- a/token-core/tcx-tron/src/signer.rs
+++ b/token-core/tcx-tron/src/signer.rs
@@ -1,15 +1,13 @@
 use crate::transaction::{TronMessageInput, TronMessageOutput, TronTxInput, TronTxOutput};
-use tcx_chain::{
-    ChainSigner, Keystore, MessageSigner as TraitMessageSigner, Result,
+use tcx_keystore::{
+    Keystore, MessageSigner as TraitMessageSigner, Result, SignatureParameters, Signer,
     TransactionSigner as TraitTransactionSigner,
 };
 
 use bitcoin_hashes::sha256::Hash;
 use bitcoin_hashes::Hash as TraitHash;
 
-use failure::format_err;
-
-use crate::keccak;
+use tcx_common::{keccak256, FromHex, ToHex};
 
 // http://jsoneditoronline.org/index.html?id=2b86a8503ba641bebed73f32b4ac9c42
 //{
@@ -44,53 +42,41 @@ use crate::keccak;
 impl TraitTransactionSigner<TronTxInput, TronTxOutput> for Keystore {
     fn sign_transaction(
         &mut self,
-        symbol: &str,
-        address: &str,
+        sign_context: &SignatureParameters,
         tx: &TronTxInput,
     ) -> Result<TronTxOutput> {
-        //        let mut raw = tx.raw.clone();
-        let data = hex::decode(&tx.raw_data)?;
+        let data = Vec::from_hex(&tx.raw_data)?;
         let hash = Hash::hash(&data);
 
-        let sign_result = self.sign_recoverable_hash(&hash[..], symbol, address, None);
+        let sign_result =
+            self.secp256k1_ecdsa_sign_recoverable(&hash[..], &sign_context.derivation_path)?;
 
-        match sign_result {
-            Ok(r) => Ok(TronTxOutput {
-                signatures: vec![hex::encode(r)],
-            }),
-            Err(_e) => Err(format_err!("{}", "can not format error")),
-        }
+        Ok(TronTxOutput {
+            signatures: vec![sign_result.to_hex()],
+        })
     }
 }
 
 impl TraitMessageSigner<TronMessageInput, TronMessageOutput> for Keystore {
     fn sign_message(
         &mut self,
-        symbol: &str,
-        address: &str,
+        sign_context: &SignatureParameters,
         message: &TronMessageInput,
     ) -> Result<TronMessageOutput> {
-        let data = match message.is_hex {
-            true => {
-                let mut raw_hex: String = message.value.to_owned();
-                if raw_hex.to_uppercase().starts_with("0X") {
-                    raw_hex.replace_range(..2, "")
-                }
-                hex::decode(&raw_hex)?
-            }
-            false => message.value.as_bytes().to_vec(),
-        };
+        let data = Vec::from_hex_auto(&message.value)?;
+
         let header = match message.is_tron_header {
             true => "\x19TRON Signed Message:\n32".as_bytes(),
             false => "\x19Ethereum Signed Message:\n32".as_bytes(),
         };
         let to_hash = [header, &data].concat();
 
-        let hash = keccak(&to_hash);
-        let mut sign_result = self.sign_recoverable_hash(&hash[..], symbol, address, None)?;
-        sign_result[64] = sign_result[64] + 27;
+        let hash = keccak256(&to_hash);
+        let mut sign_result =
+            self.secp256k1_ecdsa_sign_recoverable(&hash[..], &sign_context.derivation_path)?;
+        sign_result[64] += 27;
         Ok(TronMessageOutput {
-            signature: hex::encode(sign_result),
+            signature: sign_result.to_0x_hex(),
         })
     }
 }
@@ -98,43 +84,12 @@ impl TraitMessageSigner<TronMessageInput, TronMessageOutput> for Keystore {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::address::Address;
-
-    use tcx_chain::{HdKeystore, Keystore, KeystoreGuard, Metadata};
-    use tcx_constants::{CoinInfo, TEST_PASSWORD};
-    use tcx_constants::{CurveType, TEST_MNEMONIC};
-    use tcx_primitive::{PrivateKey, Secp256k1PrivateKey};
+    use tcx_constants::{coin_info_from_param, CurveType, TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_keystore::{HdKeystore, Keystore, KeystoreGuard, Metadata};
+    use tcx_primitive::Secp256k1PrivateKey;
 
     #[test]
-    fn sign_transaction() -> core::result::Result<(), failure::Error> {
-        /*
-        (
-            r#" {
-            "visible": false,
-            "txID": "dc74fc99076e7638067753c5c9c3aa61f9ce208707ef6940e4ab8a4944b5d69f",
-            "raw_data": {
-            "contract": [
-                {
-                    "parameter": {
-                    "value": {
-                        "amount": 100,
-                        "owner_address": "41a1e81654258bf14f63feb2e8d1380075d45b0dac",
-                        "to_address": "410b3e84ec677b3e63c99affcadb91a6b4e086798f"
-                    },
-                    "type_url": "type.googleapis.com/protocol.TransferContract"
-                },
-                    "type": "TransferContract"
-                }
-            ],
-            "ref_block_bytes": "0831",
-            "ref_block_hash": "b02efdc02638b61e",
-            "expiration": 1565866902000,
-            "timestamp": 1565866844064
-        },
-            "raw_data_hex": "0a0208312208b02efdc02638b61e40f083c3a7c92d5a65080112610a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412300a1541a1e81654258bf14f63feb2e8d1380075d45b0dac1215410b3e84ec677b3e63c99affcadb91a6b4e086798f186470a0bfbfa7c92d"
-        } "#,
-        */
-
+    fn test_sign_transaction() -> core::result::Result<(), anyhow::Error> {
         let tx = TronTxInput {
             raw_data: "0a0208312208b02efdc02638b61e40f083c3a7c92d5a65080112610a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412300a1541a1e81654258bf14f63feb2e8d1380075d45b0dac1215410b3e84ec677b3e63c99affcadb91a6b4e086798f186470a0bfbfa7c92d".to_string()
         };
@@ -142,41 +97,69 @@ mod tests {
         let meta = Metadata::default();
         let mut keystore =
             Keystore::Hd(HdKeystore::from_mnemonic(&TEST_MNEMONIC, &TEST_PASSWORD, meta).unwrap());
+        let mut guard = KeystoreGuard::unlock_by_password(&mut keystore, TEST_PASSWORD).unwrap();
+        let ks = guard.keystore_mut();
 
-        let coin_info = CoinInfo {
-            coin: "TRON".to_string(),
+        let sign_context = SignatureParameters {
+            curve: CurveType::SECP256k1,
             derivation_path: "m/44'/145'/0'/0/0".to_string(),
+            chain_type: "TRON".to_string(),
+            ..Default::default()
+        };
+        let signed_tx: TronTxOutput = ks.sign_transaction(&sign_context, &tx)?;
+
+        assert_eq!(signed_tx.signatures[0], "beac4045c3ea5136b541a3d5ec2a3e5836d94f28a1371440a01258808612bc161b5417e6f5a342451303cda840f7e21bfaba1011fad5f63538cb8cc132a9768800");
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_sign_message_by_hd() {
+        let coin_info = coin_info_from_param("TRON", "", "", "").unwrap();
+        let mut keystore =
+            Keystore::from_mnemonic(&TEST_MNEMONIC, &TEST_PASSWORD, Metadata::default()).unwrap();
+        keystore.unlock_by_password(&TEST_PASSWORD).unwrap();
+
+        let params = SignatureParameters {
+            chain_type: "TRON".to_string(),
+            derivation_path: coin_info.derivation_path.to_owned(),
             curve: CurveType::SECP256k1,
-            network: "".to_string(),
-            seg_wit: "".to_string(),
+            ..Default::default()
         };
-        let mut guard = KeystoreGuard::unlock_by_password(&mut keystore, TEST_PASSWORD).unwrap();
 
-        let ks = guard.keystore_mut();
+        let message = TronMessageInput {
+            value: "hello world".as_bytes().to_hex(),
+            is_tron_header: true,
+        };
 
-        let account = ks.derive_coin::<Address>(&coin_info).unwrap().clone();
+        let signed = keystore.sign_message(&params, &message).unwrap();
 
-        let signed_tx: TronTxOutput = ks.sign_transaction("TRON", &account.address, &tx)?;
+        assert_eq!(signed.signature, "0x8686cc3cf49e772d96d3a8147a59eb3df2659c172775f3611648bfbe7e3c48c11859b873d9d2185567a4f64a14fa38ce78dc385a7364af55109c5b6426e4c0f61b");
 
-        assert_eq!(signed_tx.signatures[0], "beac4045c3ea5136b541a3d5ec2a3e5836d94f28a1371440a01258808612bc161b5417e6f5a342451303cda840f7e21bfaba1011fad5f63538cb8cc132a9768800");
+        let message = TronMessageInput {
+            value: "hello world".as_bytes().to_hex(),
+            is_tron_header: false,
+        };
 
-        Ok(())
+        let signed = keystore.sign_message(&params, &message).unwrap();
+
+        assert_eq!(signed.signature, "0xe14f6aab4b87af398917c8a0fd6d065029df9ecc01afbc4d789eefd6c2de1e243272d630992b470c2bbb7f52024280af9bbd2e62d96ecab333c91f527b059ffe1c");
     }
 
     #[test]
-    fn sign_message() {
+    fn test_sign_message_by_private_key() {
         let sk =
             Secp256k1PrivateKey::from_wif("L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB")
                 .unwrap();
         let message =
-            hex::decode("645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76")
+            Vec::from_hex("645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76")
                 .unwrap();
         let header = "\x19TRON Signed Message:\n32".as_bytes();
         let to_signed = [header.to_vec(), message].concat();
 
-        let hash = keccak(&to_signed);
+        let hash = keccak256(&to_signed);
         let mut signed = sk.sign_recoverable(&hash).unwrap();
         signed[64] = signed[64] + 27;
-        assert_eq!("7209610445e867cf2a36ea301bb5d1fbc3da597fd2ce4bb7fa64796fbf0620a4175e9f841cbf60d12c26737797217c0082fdb3caa8e44079e04ec3f93e86bbea1c", hex::encode(&signed))
+        assert_eq!("7209610445e867cf2a36ea301bb5d1fbc3da597fd2ce4bb7fa64796fbf0620a4175e9f841cbf60d12c26737797217c0082fdb3caa8e44079e04ec3f93e86bbea1c", signed.to_hex())
     }
 }
diff --git a/token-core/tcx-tron/src/transaction.rs b/token-core/tcx-tron/src/transaction.rs
index 73162799..2f5a3ae2 100644
--- a/token-core/tcx-tron/src/transaction.rs
+++ b/token-core/tcx-tron/src/transaction.rs
@@ -23,8 +23,6 @@ pub struct TronMessageInput {
     #[prost(string, tag = "1")]
     pub value: ::prost::alloc::string::String,
     #[prost(bool, tag = "2")]
-    pub is_hex: bool,
-    #[prost(bool, tag = "3")]
     pub is_tron_header: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
diff --git a/token-core/tcx/Cargo.toml b/token-core/tcx/Cargo.toml
index f1739cbf..d895c960 100644
--- a/token-core/tcx/Cargo.toml
+++ b/token-core/tcx/Cargo.toml
@@ -2,47 +2,53 @@
 name = "tcx"
 version = "0.1.0"
 authors = ["Neal Xu <imxuneal@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 tcx-proto = { path = "../tcx-proto" }
 tcx-crypto = { path = "../tcx-crypto", features = ["cache_dk"] }
-tcx-chain = { path = "../tcx-chain", features = ["cache_dk"] }
-tcx-btc-fork = {path = "../tcx-btc-fork"}
-tcx-bch = {path = "../tcx-bch"}
-tcx-tron = {path = "../tcx-tron"}
-tcx-ckb = {path = "../tcx-ckb"}
-tcx-filecoin = {path = "../tcx-filecoin"}
-tcx-substrate = {path = "../tcx-substrate"}
+tcx-keystore = { path = "../tcx-keystore", features = ["cache_dk"] }
+tcx-btc-kin = { path = "../tcx-btc-kin" }
+tcx-tron = { path = "../tcx-tron" }
+tcx-ckb = { path = "../tcx-ckb" }
+tcx-filecoin = { path = "../tcx-filecoin" }
+tcx-substrate = { path = "../tcx-substrate" }
+tcx-atom = { path = "../tcx-atom" }
+tcx-eos = { path = "../tcx-eos" }
 tcx-primitive = { path = "../tcx-primitive" }
-tcx-constants = { path = "../tcx-constants"}
-tcx-tezos = {path = "../tcx-tezos"}
-tcx-eth2 = {path = "../tcx-eth2"}
-zksync-crypto = {path = "../zksync-crypto"}
+tcx-constants = { path = "../tcx-constants" }
+tcx-tezos = { path = "../tcx-tezos" }
+tcx-eth2 = { path = "../tcx-eth2" }
+tcx-eth = { path = "../tcx-eth" }
+tcx-common = { path = "../tcx-common" }
+tcx-migration = { path = "../tcx-migration" }
 #zksync-crypto = { git="https://github.com/consenlabs/zksync", branch="hotfix/compatible_with_tcx" }
 
-prost = "0.11.2"
-bytes = "1.3.0"
-prost-types = "0.11.2"
+prost = "=0.11.2"
+bytes = "=1.4.0"
+prost-types = "=0.11.2"
 
-libc = "0.2.138"
-log = "0.4.17"
-serde_json = "1.0.88"
-serde = { version = "1.0.147", features = ["derive"] }
-failure = "0.1.8"
-lazy_static = "1.4.0"
-hex = "0.4.3"
-base64 = "0.13.1"
-base58 = "0.2.0"
-parking_lot = "0.12.1"
+libc = "=0.2.140"
+log = "=0.4.17"
+serde_json = "=1.0.89"
+serde = { version = "=1.0.147", features = ["derive"] }
+anyhow = { version = "=1.0.79", features = [] }
+lazy_static = "=1.4.0"
+hex = "=0.4.3"
+base64 = "=0.13.1"
+base58 = "=0.2.0"
+parking_lot = "=0.12.1"
+ethereum-types = "=0.14.0"
+strum = { version = "=0.25.0", features = ["derive"] }
 
 [lib]
 name = "tcx"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-prost-build = "0.11.3"
+prost-build = "=0.11.4"
 
 [dev-dependencies]
-sp-core = "7.0.0"
-sp-runtime = "7.0.0"
+serial_test = "=2.0.0"
+sp-core = "=7.0.0"
+sp-runtime = "=7.0.0"
diff --git a/token-core/tcx/src/api.rs b/token-core/tcx/src/api.rs
index 8f642944..61488d93 100644
--- a/token-core/tcx/src/api.rs
+++ b/token-core/tcx/src/api.rs
@@ -14,7 +14,7 @@ pub struct TcxAction {
 /// A common response when error occurred.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Response {
+pub struct GeneralResult {
     #[prost(bool, tag = "1")]
     pub is_success: bool,
     #[prost(string, tag = "2")]
@@ -35,8 +35,111 @@ pub struct InitTokenCoreXParam {
     #[prost(bool, tag = "4")]
     pub is_debug: bool,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SignHashesParam {
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "4")]
+    pub data_to_sign: ::prost::alloc::vec::Vec<sign_hashes_param::DataToSign>,
+    #[prost(oneof = "sign_hashes_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<sign_hashes_param::Key>,
+}
+/// Nested message and enum types in `SignHashesParam`.
+pub mod sign_hashes_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct DataToSign {
+        #[prost(string, tag = "1")]
+        pub hash: ::prost::alloc::string::String,
+        #[prost(string, tag = "2")]
+        pub path: ::prost::alloc::string::String,
+        #[prost(string, tag = "3")]
+        pub curve: ::prost::alloc::string::String,
+        #[prost(string, tag = "4")]
+        pub sig_alg: ::prost::alloc::string::String,
+    }
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SignHashesResult {
+    #[prost(string, repeated, tag = "1")]
+    pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PublicKeyDerivation {
+    #[prost(string, tag = "1")]
+    pub chain_type: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub path: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub curve: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetPublicKeysParam {
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "4")]
+    pub derivations: ::prost::alloc::vec::Vec<PublicKeyDerivation>,
+    #[prost(oneof = "get_public_keys_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<get_public_keys_param::Key>,
+}
+/// Nested message and enum types in `GetPublicKeysParam`.
+pub mod get_public_keys_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetPublicKeysResult {
+    #[prost(string, repeated, tag = "1")]
+    pub public_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetExtendedPublicKeysParam {
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "4")]
+    pub derivations: ::prost::alloc::vec::Vec<PublicKeyDerivation>,
+    #[prost(oneof = "get_extended_public_keys_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<get_extended_public_keys_param::Key>,
+}
+/// Nested message and enum types in `GetExtendedPublicKeysParam`.
+pub mod get_extended_public_keys_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetExtendedPublicKeysResult {
+    #[prost(string, repeated, tag = "1")]
+    pub extended_public_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
 ///
-/// // FUNCTION: export_private_key(ExportPrivateKeyParam): KeystoreCommonExportResult
+/// // FUNCTION: export_private_key(ExportPrivateKeyParam): ExportResult
 /// //
 /// // export the private key from a private key keystore or a hd keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -44,108 +147,170 @@ pub struct InitTokenCoreXParam {
 pub struct ExportPrivateKeyParam {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub password: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub network: ::prost::alloc::string::String,
+    pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub main_address: ::prost::alloc::string::String,
+    pub network: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
+    pub curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "7")]
     pub path: ::prost::alloc::string::String,
+    #[prost(oneof = "export_private_key_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<export_private_key_param::Key>,
+}
+/// Nested message and enum types in `ExportPrivateKeyParam`.
+pub mod export_private_key_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
 }
 ///
-/// /// Keystore Common
-///
-/// // FUNCTION: keystore_common_verify(WalletKeyParam) -> Response
+/// // FUNCTION: export_private_key(ExportPrivateKeyParam): ExportResult
 /// //
-/// // verify the password of the keystore
+/// // export the private key from a private key keystore or a hd keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WalletKeyParam {
+pub struct ExportJsonParam {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub password: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub chain_type: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub path: ::prost::alloc::string::String,
 }
+///
+/// /// Keystore Common
+///
+/// // FUNCTION: verify_password(WalletKeyParam) -> Response
+/// //
+/// // verify the password of the keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ZksyncPrivateKeyFromSeedParam {
+pub struct WalletKeyParam {
     #[prost(string, tag = "1")]
-    pub seed: ::prost::alloc::string::String,
+    pub id: ::prost::alloc::string::String,
+    #[prost(oneof = "wallet_key_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<wallet_key_param::Key>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ZksyncPrivateKeyFromSeedResult {
-    #[prost(string, tag = "1")]
-    pub priv_key: ::prost::alloc::string::String,
+/// Nested message and enum types in `WalletKeyParam`.
+pub mod wallet_key_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ZksyncSignMusigParam {
+pub struct ExportMnemonicParam {
     #[prost(string, tag = "1")]
-    pub priv_key: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub bytes: ::prost::alloc::string::String,
+    pub id: ::prost::alloc::string::String,
+    #[prost(oneof = "export_mnemonic_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<export_mnemonic_param::Key>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ZksyncSignMusigResult {
-    #[prost(string, tag = "1")]
-    pub signature: ::prost::alloc::string::String,
+/// Nested message and enum types in `ExportMnemonicParam`.
+pub mod export_mnemonic_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ZksyncPrivateKeyToPubkeyHashParam {
+pub struct EthBatchPersonalSignParam {
     #[prost(string, tag = "1")]
-    pub priv_key: ::prost::alloc::string::String,
+    pub id: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "4")]
+    pub data: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, tag = "5")]
+    pub path: ::prost::alloc::string::String,
+    #[prost(oneof = "eth_batch_personal_sign_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<eth_batch_personal_sign_param::Key>,
+}
+/// Nested message and enum types in `EthBatchPersonalSignParam`.
+pub mod eth_batch_personal_sign_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
+    }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ZksyncPrivateKeyToPubkeyHashResult {
-    #[prost(string, tag = "1")]
-    pub pub_key_hash: ::prost::alloc::string::String,
+pub struct EthBatchPersonalSignResult {
+    #[prost(string, repeated, tag = "1")]
+    pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-/// FUNCTION: hd_store_create(HdStoreCreateParam): WalletResult
+/// FUNCTION: create_keystore(CreateKeystoreParam): KeystoreResult
 ///
 /// create a new hd keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HdStoreCreateParam {
+pub struct CreateKeystoreParam {
     #[prost(string, tag = "1")]
     pub password: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub password_hint: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
     pub name: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub network: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct IdentityResult {
+    #[prost(string, tag = "1")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub ipfs_id: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WalletResult {
+pub struct KeystoreResult {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub name: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub ipfs_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
     pub source: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "4")]
-    pub accounts: ::prost::alloc::vec::Vec<AccountResponse>,
-    #[prost(int64, tag = "5")]
+    #[prost(int64, tag = "6")]
     pub created_at: i64,
+    #[prost(string, tag = "7")]
+    pub source_fingerprint: ::prost::alloc::string::String,
 }
-/// FUNCTION: hd_store_import(HdStoreImportParam): WalletResult
+/// FUNCTION: import_mnemonic(ImportMnemonicParam): KeystoreResult
 ///
 /// create a new hd keystore by mnemonic
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HdStoreImportParam {
+pub struct ImportMnemonicParam {
     #[prost(string, tag = "1")]
     pub mnemonic: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub password: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub source: ::prost::alloc::string::String,
+    pub network: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
     pub name: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
@@ -153,21 +318,44 @@ pub struct HdStoreImportParam {
     #[prost(bool, tag = "6")]
     pub overwrite: bool,
 }
-/// FUNCTION: hd_store_derive(HdStoreDeriveParam): AccountsResponse
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ImportPrivateKeyResult {
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub name: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub ipfs_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub source: ::prost::alloc::string::String,
+    #[prost(int64, tag = "6")]
+    pub created_at: i64,
+    #[prost(string, repeated, tag = "7")]
+    pub identified_chain_types: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, tag = "8")]
+    pub identified_network: ::prost::alloc::string::String,
+    #[prost(string, tag = "9")]
+    pub identified_curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "10")]
+    pub source_fingerprint: ::prost::alloc::string::String,
+}
 ///
 /// derive new accounts from a hd keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeystoreCommonDeriveParam {
+pub struct DeriveAccountsParam {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub password: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "3")]
-    pub derivations: ::prost::alloc::vec::Vec<keystore_common_derive_param::Derivation>,
+    #[prost(message, repeated, tag = "4")]
+    pub derivations: ::prost::alloc::vec::Vec<derive_accounts_param::Derivation>,
+    #[prost(oneof = "derive_accounts_param::Key", tags = "2, 3")]
+    pub key: ::core::option::Option<derive_accounts_param::Key>,
 }
-/// Nested message and enum types in `KeystoreCommonDeriveParam`.
-pub mod keystore_common_derive_param {
+/// Nested message and enum types in `DeriveAccountsParam`.
+pub mod derive_accounts_param {
     #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Derivation {
@@ -183,6 +371,16 @@ pub mod keystore_common_derive_param {
         pub chain_id: ::prost::alloc::string::String,
         #[prost(string, tag = "6")]
         pub curve: ::prost::alloc::string::String,
+        #[prost(string, tag = "7")]
+        pub bech32_prefix: ::prost::alloc::string::String,
+    }
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "2")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "3")]
+        DerivedKey(::prost::alloc::string::String),
     }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -195,33 +393,53 @@ pub struct AccountResponse {
     #[prost(string, tag = "3")]
     pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub extended_xpub_key: ::prost::alloc::string::String,
+    pub curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub public_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "6")]
+    pub extended_public_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "7")]
+    pub encrypted_extended_public_key: ::prost::alloc::string::String,
+    #[prost(string, tag = "8")]
+    pub seg_wit: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountsResponse {
+pub struct DeriveAccountsResult {
     #[prost(message, repeated, tag = "1")]
     pub accounts: ::prost::alloc::vec::Vec<AccountResponse>,
 }
-/// FUNCTION: hd_store_export(KeystoreCommonExportResult): KeystoreCommonExistsResult
-///
 /// export the mnemonic from a hd keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeystoreCommonExportResult {
+pub struct ExportMnemonicResult {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
-    #[prost(enumeration = "KeyType", tag = "2")]
-    pub r#type: i32,
-    #[prost(string, tag = "3")]
-    pub value: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub mnemonic: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ExportPrivateKeyResult {
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub private_key: ::prost::alloc::string::String,
 }
-/// FUNCTION: private_key_store_import(PrivateKeyStoreImportParam): WalletResult
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ExportJsonResult {
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub json: ::prost::alloc::string::String,
+}
+/// FUNCTION: import_private_key(ImportPrivateKeyParam): KeystoreResult
 ///
 /// create a new private key keystore by a private key
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrivateKeyStoreImportParam {
+pub struct ImportPrivateKeyParam {
     #[prost(string, tag = "1")]
     pub private_key: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -230,55 +448,48 @@ pub struct PrivateKeyStoreImportParam {
     pub name: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
     pub password_hint: ::prost::alloc::string::String,
-    #[prost(bool, tag = "5")]
+    #[prost(string, tag = "5")]
+    pub network: ::prost::alloc::string::String,
+    #[prost(bool, tag = "6")]
     pub overwrite: bool,
-    #[prost(string, tag = "6")]
-    pub encoding: ::prost::alloc::string::String,
 }
-/// FUNCTION: private_key_store_export(PrivateKeyStoreExportParam): KeystoreCommonExportResult
-///
-/// export the private key from a private key keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrivateKeyStoreExportParam {
+pub struct ExistsMnemonicParam {
     #[prost(string, tag = "1")]
-    pub id: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub password: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub chain_type: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    pub network: ::prost::alloc::string::String,
+    pub mnemonic: ::prost::alloc::string::String,
 }
-/// FUNCTION: keystore_common_exists(KeystoreCommonExistsParam): KeystoreCommonExistsResult
-///
-/// Check is there a keystore was generate by the special privateKey or mnemonic
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeystoreCommonExistsParam {
-    #[prost(enumeration = "KeyType", tag = "1")]
-    pub r#type: i32,
+pub struct ExistsPrivateKeyParam {
+    #[prost(string, tag = "1")]
+    pub private_key: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ExistsJsonParam {
+    #[prost(string, tag = "1")]
+    pub json: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub value: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub encoding: ::prost::alloc::string::String,
+    pub password: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeystoreCommonExistsResult {
+pub struct ExistsKeystoreResult {
     #[prost(bool, tag = "1")]
     pub is_exists: bool,
     #[prost(string, tag = "2")]
     pub id: ::prost::alloc::string::String,
 }
-/// FUNCTION: keystore_common_accounts(KeystoreCommonAccountsParam): AccountsResponse
-///
-/// List all accounts from the keystore
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeystoreCommonAccountsParam {
+pub struct ImportJsonParam {
     #[prost(string, tag = "1")]
-    pub id: ::prost::alloc::string::String,
+    pub json: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub password: ::prost::alloc::string::String,
+    #[prost(bool, tag = "3")]
+    pub overwrite: bool,
 }
 /// FUNCTION: sign_tx(SignParam)
 ///
@@ -292,8 +503,14 @@ pub struct SignParam {
     #[prost(string, tag = "4")]
     pub chain_type: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
-    pub address: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "6")]
+    pub path: ::prost::alloc::string::String,
+    #[prost(string, tag = "6")]
+    pub curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "7")]
+    pub network: ::prost::alloc::string::String,
+    #[prost(string, tag = "8")]
+    pub seg_wit: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "9")]
     pub input: ::core::option::Option<::prost_types::Any>,
     #[prost(oneof = "sign_param::Key", tags = "2, 3")]
     pub key: ::core::option::Option<sign_param::Key>,
@@ -309,122 +526,195 @@ pub mod sign_param {
         DerivedKey(::prost::alloc::string::String),
     }
 }
-/// btc-fork
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ExternalAddressParam {
+pub struct DeriveSubAccountsParam {
     #[prost(string, tag = "1")]
-    pub id: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
     pub chain_type: ::prost::alloc::string::String,
-    #[prost(uint32, tag = "3")]
-    pub external_idx: u32,
+    #[prost(string, tag = "2")]
+    pub curve: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub network: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub seg_wit: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "5")]
+    pub relative_paths: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, tag = "6")]
+    pub extended_public_key: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ExternalAddressResult {
+pub struct DeriveSubAccountsResult {
+    #[prost(message, repeated, tag = "1")]
+    pub accounts: ::prost::alloc::vec::Vec<AccountResponse>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EncryptDataToIpfsParam {
     #[prost(string, tag = "1")]
-    pub address: ::prost::alloc::string::String,
+    pub identifier: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub derived_path: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub r#type: ::prost::alloc::string::String,
+    pub content: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ExternalAddressExtra {
+pub struct EncryptDataToIpfsResult {
     #[prost(string, tag = "1")]
-    pub enc_xpub: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "2")]
-    pub external_address: ::core::option::Option<external_address_extra::ExternalAddress>,
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub encrypted: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DecryptDataFromIpfsParam {
+    #[prost(string, tag = "1")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub encrypted: ::prost::alloc::string::String,
 }
-/// Nested message and enum types in `ExternalAddressExtra`.
-pub mod external_address_extra {
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DecryptDataFromIpfsResult {
+    #[prost(string, tag = "1")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub content: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SignAuthenticationMessageParam {
+    #[prost(uint64, tag = "1")]
+    pub access_time: u64,
+    #[prost(string, tag = "2")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub device_token: ::prost::alloc::string::String,
+    #[prost(oneof = "sign_authentication_message_param::Key", tags = "4, 5")]
+    pub key: ::core::option::Option<sign_authentication_message_param::Key>,
+}
+/// Nested message and enum types in `SignAuthenticationMessageParam`.
+pub mod sign_authentication_message_param {
     #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct ExternalAddress {
-        #[prost(string, tag = "1")]
-        pub address: ::prost::alloc::string::String,
-        #[prost(string, tag = "2")]
-        pub derived_path: ::prost::alloc::string::String,
-        #[prost(string, tag = "3")]
-        pub r#type: ::prost::alloc::string::String,
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "4")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "5")]
+        DerivedKey(::prost::alloc::string::String),
     }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BtcForkDeriveExtraParam {
-    #[prost(string, tag = "1")]
-    pub network: ::prost::alloc::string::String,
+pub struct SignAuthenticationMessageResult {
+    #[prost(uint64, tag = "1")]
+    pub access_time: u64,
     #[prost(string, tag = "2")]
-    pub seg_wit: ::prost::alloc::string::String,
+    pub signature: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HdStoreExtendedPublicKeyParam {
+pub struct MnemonicToPublicKeyParam {
     #[prost(string, tag = "1")]
-    pub id: ::prost::alloc::string::String,
+    pub mnemonic: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub password: ::prost::alloc::string::String,
+    pub path: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub chain_type: ::prost::alloc::string::String,
+    pub curve: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub address: ::prost::alloc::string::String,
+    pub encoding: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HdStoreExtendedPublicKeyResponse {
+pub struct MnemonicToPublicKeyResult {
     #[prost(string, tag = "1")]
-    pub extended_public_key: ::prost::alloc::string::String,
+    pub public_key: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PublicKeyParam {
+pub struct MigrateKeystoreParam {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub address: ::prost::alloc::string::String,
+    pub network: ::prost::alloc::string::String,
+    #[prost(oneof = "migrate_keystore_param::Key", tags = "3, 4")]
+    pub key: ::core::option::Option<migrate_keystore_param::Key>,
+}
+/// Nested message and enum types in `MigrateKeystoreParam`.
+pub mod migrate_keystore_param {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Key {
+        #[prost(string, tag = "3")]
+        Password(::prost::alloc::string::String),
+        #[prost(string, tag = "4")]
+        DerivedKey(::prost::alloc::string::String),
+    }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PublicKeyResult {
+pub struct MigrateKeystoreResult {
+    #[prost(bool, tag = "1")]
+    pub is_existed: bool,
+    #[prost(string, tag = "2")]
+    pub existed_id: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "3")]
+    pub keystore: ::core::option::Option<KeystoreResult>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ScanKeystoresResult {
+    #[prost(message, repeated, tag = "1")]
+    pub hd_keystores: ::prost::alloc::vec::Vec<KeystoreResult>,
+    #[prost(message, repeated, tag = "2")]
+    pub private_key_keystores: ::prost::alloc::vec::Vec<ImportPrivateKeyResult>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct LegacyKeystoreResult {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
-    pub chain_type: ::prost::alloc::string::String,
+    pub name: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
-    pub address: ::prost::alloc::string::String,
+    pub source: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
-    pub public_key: ::prost::alloc::string::String,
+    pub created_at: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "5")]
+    pub accounts: ::prost::alloc::vec::Vec<AccountResponse>,
 }
-/// only support two types
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum KeyType {
-    Mnemonic = 0,
-    PrivateKey = 1,
-}
-impl KeyType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            KeyType::Mnemonic => "MNEMONIC",
-            KeyType::PrivateKey => "PRIVATE_KEY",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "MNEMONIC" => Some(Self::Mnemonic),
-            "PRIVATE_KEY" => Some(Self::PrivateKey),
-            _ => None,
-        }
-    }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ScanLegacyKeystoresResult {
+    #[prost(string, tag = "1")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub ipfs_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub network: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub source: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "5")]
+    pub keystores: ::prost::alloc::vec::Vec<LegacyKeystoreResult>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BackupResult {
+    #[prost(string, tag = "1")]
+    pub original: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MarkIdentityWalletsParam {
+    #[prost(string, repeated, tag = "1")]
+    pub ids: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, tag = "2")]
+    pub source: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ReadKeystoreMnemonicPathResult {
+    #[prost(string, tag = "1")]
+    pub path: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/token-core/tcx/src/error_handling.rs b/token-core/tcx/src/error_handling.rs
index 87169d9a..b79a3d39 100644
--- a/token-core/tcx/src/error_handling.rs
+++ b/token-core/tcx/src/error_handling.rs
@@ -1,23 +1,17 @@
 use crate::filemanager::KEYSTORE_MAP;
+use anyhow::{anyhow, Error};
 use core::result;
-use failure::{Backtrace, Error};
 use std::{cell::RefCell, panic};
 pub type Result<T> = result::Result<T, Error>;
 
 thread_local! {
     pub static LAST_ERROR: RefCell<Option<Error>> = RefCell::new(None);
-    pub static LAST_BACKTRACE: RefCell<Option<(Option<String>, Backtrace)>> = RefCell::new(None);
 }
 
-#[cfg_attr(tarpaulin, skip)]
+#[cfg_attr(tarpaulin, ignore)]
 #[allow(irrefutable_let_patterns)]
 fn notify_err(err: Error) -> Error {
-    if let _backtrace = err.backtrace() {
-        LAST_BACKTRACE.with(|e| {
-            *e.borrow_mut() = Some((None, Backtrace::new()));
-        });
-    }
-    let display_err = format_err!("{}", &err);
+    let display_err = anyhow!("{}", &err);
     LAST_ERROR.with(|e| {
         *e.borrow_mut() = Some(err);
     });
@@ -33,7 +27,9 @@ fn lock_all_keystore() {
 
 /// catch any error and format to string
 /// ref: <https://doc.rust-lang.org/edition-guide/rust-2018/error-handling-and-panics/controlling-panics-with-std-panic.html>
-#[cfg_attr(tarpaulin, skip)]
+/// # Safety
+///
+#[cfg_attr(tarpaulin, ignore)]
 pub unsafe fn landingpad<F: FnOnce() -> Result<T> + panic::UnwindSafe, T>(f: F) -> Result<T> {
     match panic::catch_unwind(f) {
         Ok(rv) => {
@@ -51,7 +47,7 @@ pub unsafe fn landingpad<F: FnOnce() -> Result<T> + panic::UnwindSafe, T>(f: F)
                     None => "Box<Any>",
                 },
             };
-            Err(notify_err(format_err!("{}", msg)))
+            Err(notify_err(anyhow!("{}", msg)))
         }
     }
 }
diff --git a/token-core/tcx/src/filemanager.rs b/token-core/tcx/src/filemanager.rs
index 3895cdf1..be1fb29e 100644
--- a/token-core/tcx/src/filemanager.rs
+++ b/token-core/tcx/src/filemanager.rs
@@ -1,37 +1,40 @@
+use parking_lot::RwLock;
 use std::collections::HashMap;
 use std::fs;
 use std::io::Write;
 use std::path::Path;
-//use std::sync::RwLock;
-use parking_lot::RwLock;
-use tcx_chain::Keystore;
+use tcx_keystore::Keystore;
 
 use crate::error_handling::Result;
 
 lazy_static! {
     pub static ref KEYSTORE_MAP: RwLock<HashMap<String, Keystore>> = RwLock::new(HashMap::new());
     pub static ref WALLET_FILE_DIR: RwLock<String> = RwLock::new("../test-data".to_string());
+    pub static ref LEGACY_WALLET_FILE_DIR: RwLock<String> = RwLock::new("../test-data".to_string());
+    pub static ref KEYSTORE_BASE_DIR: RwLock<String> = RwLock::new("../test-data".to_string());
     pub static ref IS_DEBUG: RwLock<bool> = RwLock::new(false);
 }
 
+pub const WALLET_V1_DIR: &str = "wallets";
+pub const WALLET_V2_DIR: &str = "walletsV2";
+
 pub fn clean_keystore() {
     KEYSTORE_MAP.write().clear()
 }
 
 pub fn cache_keystore(keystore: Keystore) {
-    KEYSTORE_MAP
-        .write()
-        .insert(keystore.id().to_owned(), keystore);
+    let mut map = KEYSTORE_MAP.write();
+    map.remove(&keystore.id());
+    map.insert(keystore.id(), keystore);
 }
 
 pub fn flush_keystore(ks: &Keystore) -> Result<()> {
     let json = ks.to_json();
-
     let file_dir = WALLET_FILE_DIR.read();
     let ks_path = format!("{}/{}.json", file_dir, ks.id());
     let path = Path::new(&ks_path);
     let mut file = fs::File::create(path)?;
-    let _ = file.write_all(&json.as_bytes());
+    let _ = file.write_all(json.as_bytes());
     Ok(())
 }
 
diff --git a/token-core/tcx/src/handler.rs b/token-core/tcx/src/handler.rs
index 9bfdd245..dd53ff6d 100644
--- a/token-core/tcx/src/handler.rs
+++ b/token-core/tcx/src/handler.rs
@@ -1,73 +1,100 @@
+use bytes::BytesMut;
+use prost::Message;
+use serde_json::Value;
 use std::fs;
 use std::io::Read;
 use std::path::Path;
+use std::str::FromStr;
+use tcx_eos::encode_eos_wif;
+use tcx_eth2::transaction::{SignBlsToExecutionChangeParam, SignBlsToExecutionChangeResult};
+use tcx_keystore::keystore::IdentityNetwork;
+use tcx_migration::legacy_ipfs;
 
-use bytes::BytesMut;
-use prost::Message;
-use serde_json::Value;
-use tcx_primitive::{get_account_path, private_key_without_version, FromHex, TypedPrivateKey};
+use tcx_common::{FromHex, ToHex};
+use tcx_primitive::{
+    private_key_without_version, PrivateKey, Secp256k1PrivateKey, Sr25519PrivateKey,
+    TypedPrivateKey, TypedPublicKey,
+};
 
-use tcx_bch::{BchAddress, BchTransaction};
-use tcx_btc_fork::{
-    BtcForkAddress, BtcForkSegWitTransaction, BtcForkSignedTxOutput, BtcForkTransaction,
-    BtcForkTxInput, WifDisplay,
+use tcx_btc_kin::WIFDisplay;
+use tcx_keystore::{
+    fingerprint_from_mnemonic, fingerprint_from_private_key, identity, Keystore, KeystoreGuard,
+    SignatureParameters, Signer,
 };
-use tcx_chain::{key_hash_from_mnemonic, key_hash_from_private_key, Keystore, KeystoreGuard};
-use tcx_chain::{Account, HdKeystore, Metadata, PrivateKeystore, Source};
-use tcx_ckb::{CkbAddress, CkbTxInput};
+use tcx_keystore::{Account, HdKeystore, Metadata, PrivateKeystore, Source};
+
+use anyhow::{anyhow, ensure};
 use tcx_crypto::{XPUB_COMMON_IV, XPUB_COMMON_KEY_128};
-use tcx_filecoin::{FilecoinAddress, KeyInfo, UnsignedMessage};
-use tcx_tron::TrxAddress;
+use tcx_filecoin::KeyInfo;
 
-use crate::api::keystore_common_derive_param::Derivation;
-use crate::api::sign_param::Key;
+use crate::api::derive_accounts_param::Derivation;
 use crate::api::{
-    AccountResponse, AccountsResponse, DerivedKeyResult, ExportPrivateKeyParam, HdStoreCreateParam,
-    HdStoreImportParam, KeyType, KeystoreCommonAccountsParam, KeystoreCommonDeriveParam,
-    KeystoreCommonExistsParam, KeystoreCommonExistsResult, KeystoreCommonExportResult,
-    PrivateKeyStoreExportParam, PrivateKeyStoreImportParam, PublicKeyParam, PublicKeyResult,
-    Response, WalletKeyParam, WalletResult, ZksyncPrivateKeyFromSeedParam,
-    ZksyncPrivateKeyFromSeedResult, ZksyncPrivateKeyToPubkeyHashParam,
-    ZksyncPrivateKeyToPubkeyHashResult, ZksyncSignMusigParam, ZksyncSignMusigResult,
+    self, export_private_key_param, AccountResponse, BackupResult, CreateKeystoreParam,
+    DecryptDataFromIpfsParam, DecryptDataFromIpfsResult, DeriveAccountsParam, DeriveAccountsResult,
+    DeriveSubAccountsParam, DeriveSubAccountsResult, DerivedKeyResult, EncryptDataToIpfsParam,
+    EncryptDataToIpfsResult, ExistsJsonParam, ExistsKeystoreResult, ExistsMnemonicParam,
+    ExistsPrivateKeyParam, ExportJsonParam, ExportJsonResult, ExportMnemonicParam,
+    ExportMnemonicResult, ExportPrivateKeyParam, ExportPrivateKeyResult, GeneralResult,
+    GetExtendedPublicKeysParam, GetExtendedPublicKeysResult, GetPublicKeysParam,
+    GetPublicKeysResult, ImportJsonParam, ImportMnemonicParam, ImportPrivateKeyParam,
+    ImportPrivateKeyResult, KeystoreResult, MnemonicToPublicKeyParam, MnemonicToPublicKeyResult,
+    ScanKeystoresResult, SignAuthenticationMessageParam, SignAuthenticationMessageResult,
+    SignHashesParam, SignHashesResult, WalletKeyParam,
 };
+use crate::api::{EthBatchPersonalSignParam, EthBatchPersonalSignResult};
 use crate::api::{InitTokenCoreXParam, SignParam};
 use crate::error_handling::Result;
-use crate::filemanager::{cache_keystore, clean_keystore, flush_keystore, WALLET_FILE_DIR};
+use crate::filemanager::{
+    cache_keystore, clean_keystore, flush_keystore, KEYSTORE_BASE_DIR, LEGACY_WALLET_FILE_DIR,
+    WALLET_FILE_DIR, WALLET_V1_DIR, WALLET_V2_DIR,
+};
 use crate::filemanager::{delete_keystore_file, KEYSTORE_MAP};
 
 use crate::IS_DEBUG;
-use base58::ToBase58;
-use tcx_chain::tcx_ensure;
-use tcx_chain::Address;
-use tcx_chain::{MessageSigner, TransactionSigner};
+
+use base58::FromBase58;
+use tcx_keystore::tcx_ensure;
+
 use tcx_constants::coin_info::coin_info_from_param;
-use tcx_constants::CurveType;
+use tcx_constants::{CoinInfo, CurveType};
 use tcx_crypto::aes::cbc::encrypt_pkcs7;
-use tcx_crypto::hash::dsha256;
 use tcx_crypto::KDF_ROUNDS;
-use tcx_eth2::address::Eth2Address;
-use tcx_eth2::transaction::{SignBlsToExecutionChangeParam, SignBlsToExecutionChangeResult};
-use tcx_primitive::{Bip32DeterministicPublicKey, Ss58Codec};
-use tcx_substrate::{
-    decode_substrate_keystore, encode_substrate_keystore, ExportSubstrateKeystoreResult,
-    SubstrateAddress, SubstrateKeystore, SubstrateKeystoreParam, SubstrateRawTxIn,
+use tcx_eth::signer::batch_personal_sign;
+use tcx_keystore::{MessageSigner, TransactionSigner};
+
+use tcx_primitive::Ss58Codec;
+use tcx_substrate::{decode_substrate_keystore, encode_substrate_keystore, SubstrateKeystore};
+
+use tcx_migration::migration::LegacyKeystore;
+use tcx_primitive::TypedDeterministicPublicKey;
+use tcx_tezos::{encode_tezos_private_key, parse_tezos_private_key};
+
+use crate::macros::{impl_to_key, use_chains};
+use crate::migration::{
+    read_all_identity_wallet_ids, remove_all_identity_wallets, remove_old_keystore_by_id,
 };
-use tcx_tezos::address::TezosAddress;
-use tcx_tezos::transaction::TezosRawTxIn;
-use tcx_tezos::{build_tezos_base58_private_key, pars_tezos_private_key};
-use tcx_tron::transaction::{TronMessageInput, TronTxInput};
-use zksync_crypto::{private_key_from_seed, private_key_to_pubkey_hash, sign_musig};
-
-pub(crate) fn encode_message(msg: impl Message) -> Result<Vec<u8>> {
-    if *IS_DEBUG.read() {
-        println!("{:#?}", msg);
-    }
+
+use_chains!(
+    tcx_btc_kin::bitcoin,
+    tcx_btc_kin::omni,
+    tcx_btc_kin::bitcoincash,
+    tcx_filecoin::filecoin,
+    tcx_eos::eos,
+    tcx_ckb::nervos,
+    tcx_eth::ethereum,
+    tcx_atom::cosmos,
+    tcx_substrate::polkadot,
+    tcx_tezos::tezos,
+    tcx_tron::tron,
+);
+
+pub fn encode_message(msg: impl Message) -> Result<Vec<u8>> {
     let mut buf = BytesMut::with_capacity(msg.encoded_len());
     msg.encode(&mut buf)?;
     Ok(buf.to_vec())
 }
 
-fn derive_account<'a, 'b>(keystore: &mut Keystore, derivation: &Derivation) -> Result<Account> {
+fn derive_account(keystore: &mut Keystore, derivation: &Derivation) -> Result<Account> {
     let mut coin_info = coin_info_from_param(
         &derivation.chain_type,
         &derivation.network,
@@ -76,16 +103,274 @@ fn derive_account<'a, 'b>(keystore: &mut Keystore, derivation: &Derivation) -> R
     )?;
     coin_info.derivation_path = derivation.path.to_owned();
 
-    match derivation.chain_type.as_str() {
-        "BITCOINCASH" => keystore.derive_coin::<BchAddress>(&coin_info),
-        "LITECOIN" => keystore.derive_coin::<BtcForkAddress>(&coin_info),
-        "TRON" => keystore.derive_coin::<TrxAddress>(&coin_info),
-        "NERVOS" => keystore.derive_coin::<CkbAddress>(&coin_info),
-        "POLKADOT" | "KUSAMA" => keystore.derive_coin::<SubstrateAddress>(&coin_info),
-        "TEZOS" => keystore.derive_coin::<TezosAddress>(&coin_info),
-        "FILECOIN" => keystore.derive_coin::<FilecoinAddress>(&coin_info),
-        "ETHEREUM2" => keystore.derive_coin::<Eth2Address>(&coin_info),
-        _ => Err(format_err!("unsupported_chain")),
+    derive_account_internal(&coin_info, keystore)
+}
+
+pub fn encrypt_xpub(xpub: &str) -> Result<String> {
+    let key = tcx_crypto::XPUB_COMMON_KEY_128.read();
+    let iv = tcx_crypto::XPUB_COMMON_IV.read();
+    let key_bytes = Vec::from_hex(&*key)?;
+    let iv_bytes = Vec::from_hex(&*iv)?;
+    let encrypted = encrypt_pkcs7(xpub.as_bytes(), &key_bytes, &iv_bytes)?;
+    Ok(base64::encode(encrypted))
+}
+
+fn key_data_from_any_format_pk(pk: &str) -> Result<Vec<u8>> {
+    let decoded = Vec::from_hex_auto(pk);
+    if let Ok(bytes) = decoded {
+        if bytes.len() <= 64 {
+            Ok(bytes)
+        } else {
+            // import filecoin
+            Ok(KeyInfo::from_lotus(&bytes)?.decode_private_key()?)
+        }
+    } else {
+        private_key_without_version(pk)
+    }
+}
+
+fn fingerprint_from_any_format_pk(pk: &str) -> Result<String> {
+    let key_data = if pk.starts_with("edsk") {
+        parse_tezos_private_key(pk)?
+    } else {
+        key_data_from_any_format_pk(pk)?
+    };
+    fingerprint_from_private_key(&key_data)
+}
+
+fn import_private_key_internal(
+    param: &ImportPrivateKeyParam,
+    source: Option<Source>,
+    original: Option<String>,
+) -> Result<ImportPrivateKeyResult> {
+    let mut founded_id: Option<String> = None;
+    {
+        let fingerprint = fingerprint_from_any_format_pk(&param.private_key)?;
+        let map = KEYSTORE_MAP.read();
+        if let Some(founded) = map
+            .values()
+            .find(|keystore| keystore.fingerprint() == fingerprint)
+        {
+            founded_id = Some(founded.id());
+        }
+    }
+
+    if founded_id.is_some() && !param.overwrite {
+        return Err(anyhow!("{}", "address_already_exist"));
+    }
+
+    let decoded_ret = decode_private_key(&param.private_key)?;
+    if !decoded_ret.network.is_empty() {
+        let expected_network = if param.network.is_empty() {
+            "MAINNET"
+        } else {
+            param.network.as_str()
+        };
+        if decoded_ret.network != expected_network {
+            return Err(anyhow!("{}", "private_key_network_mismatch"));
+        }
+    }
+
+    let private_key = decoded_ret.bytes.to_hex();
+    let meta_source = if let Some(source) = source {
+        source
+    } else {
+        decoded_ret.source
+    };
+
+    let original = if let Some(original) = original {
+        original
+    } else {
+        param.private_key.to_string()
+    };
+
+    let meta = Metadata {
+        name: param.name.to_string(),
+        password_hint: Some(param.password_hint.to_string()),
+        source: meta_source,
+        identified_chain_types: Some(decoded_ret.chain_types.clone()),
+        ..Metadata::default()
+    };
+    let pk_store = PrivateKeystore::from_private_key(
+        &private_key,
+        &param.password,
+        decoded_ret.curve,
+        meta,
+        Some(original),
+    )?;
+
+    let mut keystore = Keystore::PrivateKey(pk_store);
+
+    if let Some(exist_kid) = founded_id {
+        keystore.set_id(&exist_kid)
+    }
+
+    flush_keystore(&keystore)?;
+
+    let meta = keystore.meta();
+    let identity = keystore.identity();
+    let wallet = ImportPrivateKeyResult {
+        id: keystore.id(),
+        name: meta.name.to_owned(),
+        source: meta_source.to_string(),
+        created_at: meta.timestamp,
+        identifier: identity.identifier.to_string(),
+        ipfs_id: identity.ipfs_id.to_string(),
+        identified_chain_types: decoded_ret.chain_types.to_owned(),
+        identified_network: decoded_ret.network.to_string(),
+        identified_curve: decoded_ret.curve.as_str().to_string(),
+        source_fingerprint: keystore.fingerprint().to_string(),
+    };
+    cache_keystore(keystore);
+    Ok(wallet)
+}
+
+struct DecodedPrivateKey {
+    bytes: Vec<u8>,
+    network: String,
+    curve: CurveType,
+    chain_types: Vec<String>,
+    source: Source,
+}
+
+fn decode_private_key(private_key: &str) -> Result<DecodedPrivateKey> {
+    let private_key_bytes: Vec<u8>;
+    let mut network = "".to_string();
+    let mut chain_types: Vec<String> = vec![];
+    let mut curve: CurveType = CurveType::SECP256k1;
+    let mut source: Source = Source::Private;
+    if private_key.starts_with("edsk") {
+        private_key_bytes = parse_tezos_private_key(private_key)?;
+        chain_types.push("TEZOS".to_string());
+        curve = CurveType::ED25519;
+    } else {
+        let decoded = Vec::from_hex_auto(private_key);
+        if let Ok(decoded_data) = decoded {
+            if decoded_data.len() == 32 {
+                private_key_bytes = decoded_data;
+                chain_types = vec![
+                    "BITCOIN".to_string(),
+                    "ETHEREUM".to_string(),
+                    "BITCOINCASH".to_string(),
+                    "LITECOIN".to_string(),
+                    "EOS".to_string(),
+                    "TRON".to_string(),
+                    "FILECOIN".to_string(),
+                ];
+                curve = CurveType::SECP256k1;
+            } else if decoded_data.len() == 64 {
+                let sr25519_key = Sr25519PrivateKey::from_slice(&decoded_data)?;
+                private_key_bytes = sr25519_key.to_bytes();
+                chain_types.push("KUSAMA".to_string());
+                chain_types.push("POLKADOT".to_string());
+                curve = CurveType::SR25519;
+            } else {
+                let key_info = KeyInfo::from_lotus(&decoded_data)?;
+                private_key_bytes = key_info.decode_private_key()?;
+                chain_types.push("FILECOIN".to_string());
+                if key_info.r#type != "secp256k1" {
+                    curve = CurveType::BLS;
+                }
+            }
+        } else {
+            let data_len = private_key
+                .from_base58()
+                .map_err(|_| anyhow!("invalid_wif"))?
+                .len();
+            let (k1_pk, ver) = Secp256k1PrivateKey::from_ss58check_with_version(private_key)?;
+            private_key_bytes = k1_pk.0.to_bytes();
+
+            source = Source::Wif;
+            match ver[0] {
+                0xef => {
+                    network = "TESTNET".to_string();
+                    chain_types.push("BITCOIN".to_string());
+                    chain_types.push("BITCOINCASH".to_string());
+                    chain_types.push("LITECOIN".to_string());
+                }
+                0x80 => {
+                    if data_len == 37 {
+                        // EOS 1byte network + 32bytes private key + 4byte checksum = 37bytes
+                        // EOS not use compressed suffix  https://developers.eos.io/manuals/eos/v2.2/keosd/wallet-specification
+                        network = "".to_string();
+                        chain_types.push("EOS".to_string());
+                    } else {
+                        // EOS 1byte network + 32bytes private key + 1byte compressed suffix + 4byte checksum = 38bytes
+                        network = "MAINNET".to_string();
+                        chain_types.push("BITCOIN".to_string());
+                        chain_types.push("BITCOINCASH".to_string());
+                    }
+                }
+                0xb0 => {
+                    network = "MAINNET".to_string();
+                    chain_types.push("LITECOIN".to_string());
+                }
+                _ => return Err(anyhow!("unknow ver header when parse wif, ver: {}", ver[0])),
+            }
+        }
+    }
+
+    Ok(DecodedPrivateKey {
+        bytes: private_key_bytes,
+        network,
+        curve,
+        chain_types,
+        source,
+    })
+}
+
+fn exists_fingerprint(fingerprint: &str) -> Result<Vec<u8>> {
+    let map = &KEYSTORE_MAP.read();
+
+    let founded: Option<&Keystore> = map
+        .values()
+        .find(|keystore| keystore.fingerprint() == fingerprint);
+    let result: ExistsKeystoreResult;
+    if let Some(ks) = founded {
+        result = ExistsKeystoreResult {
+            is_exists: true,
+            id: ks.id(),
+        }
+    } else {
+        result = ExistsKeystoreResult {
+            is_exists: false,
+            id: "".to_owned(),
+        }
+    }
+    encode_message(result)
+}
+
+fn key_info_from_v3(keystore: &str, password: &str) -> Result<(Vec<u8>, String)> {
+    let ks: LegacyKeystore = serde_json::from_str(keystore)?;
+    ks.validate_v3(password)?;
+    let key = tcx_crypto::Key::Password(password.to_string());
+    let unlocker = ks.crypto.use_key(&key)?;
+    let private_key = unlocker.plaintext()?;
+    Ok((private_key, "Imported ETH".to_string()))
+}
+
+fn key_info_from_substrate_keystore(keystore: &str, password: &str) -> Result<(Vec<u8>, String)> {
+    let ks: SubstrateKeystore = serde_json::from_str(keystore)?;
+    ks.validate()?;
+    let pk = decode_substrate_keystore(&ks, password)?;
+    Ok((pk, ks.meta.name))
+}
+
+fn curve_to_chain_type(curve: &CurveType) -> Vec<String> {
+    match curve {
+        CurveType::SECP256k1 => vec![
+            "BITCOIN".to_string(),
+            "BITCOINCASH".to_string(),
+            "LITECOIN".to_string(),
+            "FILECOIN".to_string(),
+            "EOS".to_string(),
+            "TRON".to_string(),
+            "COSMOS".to_string(),
+        ],
+        CurveType::ED25519 => vec!["TEZOS".to_string()],
+        CurveType::SR25519 => vec!["KUSAMA".to_string(), "POLKADOT".to_string()],
+        CurveType::BLS => vec!["FILECOIN".to_string()],
+        _ => vec![],
     }
 }
 
@@ -96,14 +381,20 @@ pub fn init_token_core_x(data: &[u8]) -> Result<()> {
         xpub_common_iv,
         is_debug,
     } = InitTokenCoreXParam::decode(data).unwrap();
-    *WALLET_FILE_DIR.write() = file_dir.to_string();
-    *XPUB_COMMON_KEY_128.write() = xpub_common_key.to_string();
-    *XPUB_COMMON_IV.write() = xpub_common_iv.to_string();
+    *KEYSTORE_BASE_DIR.write() = file_dir.to_string();
+
+    let v2_dir = format!("{}/{}", file_dir, WALLET_V2_DIR);
+    fs::create_dir_all(&v2_dir)?;
+    *WALLET_FILE_DIR.write() = v2_dir.to_string();
+    *LEGACY_WALLET_FILE_DIR.write() = format!("{}/{}", file_dir, WALLET_V1_DIR);
+
+    *XPUB_COMMON_KEY_128.write() = xpub_common_key;
+    *XPUB_COMMON_IV.write() = xpub_common_iv;
 
     if is_debug {
         *IS_DEBUG.write() = is_debug;
         if is_debug {
-            *KDF_ROUNDS.write() = 1024;
+            *KDF_ROUNDS.write() = 1;
         }
     }
     scan_keystores()?;
@@ -111,11 +402,15 @@ pub fn init_token_core_x(data: &[u8]) -> Result<()> {
     Ok(())
 }
 
-pub(crate) fn scan_keystores() -> Result<()> {
+pub fn scan_keystores() -> Result<ScanKeystoresResult> {
     clean_keystore();
     let file_dir = WALLET_FILE_DIR.read();
     let p = Path::new(file_dir.as_str());
     let walk_dir = std::fs::read_dir(p).expect("read dir");
+
+    let mut hd_keystores: Vec<KeystoreResult> = Vec::new();
+    let mut private_key_keystores: Vec<ImportPrivateKeyResult> = Vec::new();
+
     for entry in walk_dir {
         let entry = entry.expect("DirEntry");
         let fp = entry.path();
@@ -136,692 +431,503 @@ pub(crate) fn scan_keystores() -> Result<()> {
         let v: Value = serde_json::from_str(&contents).expect("read json from content");
 
         let version = v["version"].as_i64().expect("version");
-        if version == i64::from(HdKeystore::VERSION)
-            || version == i64::from(PrivateKeystore::VERSION)
-        {
+
+        if version == HdKeystore::VERSION || version == PrivateKeystore::VERSION {
             let keystore = Keystore::from_json(&contents)?;
+
+            if version == HdKeystore::VERSION {
+                let keystore_result = KeystoreResult {
+                    id: keystore.id(),
+                    name: keystore.meta().name.to_string(),
+                    identifier: keystore.identity().identifier.to_string(),
+                    ipfs_id: keystore.identity().ipfs_id.to_string(),
+                    source: keystore.meta().source.to_string(),
+                    created_at: keystore.meta().timestamp,
+                    source_fingerprint: keystore.fingerprint().to_string(),
+                };
+                hd_keystores.push(keystore_result);
+            } else {
+                let curve = keystore
+                    .get_curve()
+                    .expect("pk keystore must contains curve");
+                let kestore_result = ImportPrivateKeyResult {
+                    id: keystore.id(),
+                    name: keystore.meta().name.to_string(),
+                    identifier: keystore.identity().identifier.to_string(),
+                    ipfs_id: keystore.identity().ipfs_id.to_string(),
+                    source: keystore.meta().source.to_string(),
+                    created_at: keystore.meta().timestamp,
+                    source_fingerprint: keystore.fingerprint().to_string(),
+                    identified_chain_types: curve_to_chain_type(&curve),
+                    identified_network: keystore.meta().network.to_string(),
+                    identified_curve: curve.as_str().to_string(),
+                };
+                private_key_keystores.push(kestore_result);
+            }
             cache_keystore(keystore);
         }
     }
-    Ok(())
+
+    Ok(ScanKeystoresResult {
+        hd_keystores,
+        private_key_keystores,
+    })
 }
 
-pub(crate) fn hd_store_create(data: &[u8]) -> Result<Vec<u8>> {
-    let param: HdStoreCreateParam =
-        HdStoreCreateParam::decode(data).expect("import wallet from mnemonic");
+pub fn create_keystore(data: &[u8]) -> Result<Vec<u8>> {
+    let param: CreateKeystoreParam =
+        CreateKeystoreParam::decode(data).expect("create_keystore param");
 
-    let mut meta = Metadata::default();
-    meta.name = param.name.to_owned();
-    meta.password_hint = param.password_hint.to_owned();
-    meta.source = Source::Mnemonic;
+    let meta = Metadata {
+        name: param.name,
+        password_hint: Some(param.password_hint),
+        source: Source::NewMnemonic,
+        network: IdentityNetwork::from_str(&param.network)?,
+        ..Metadata::default()
+    };
 
     let ks = HdKeystore::new(&param.password, meta);
 
     let keystore = Keystore::Hd(ks);
     flush_keystore(&keystore)?;
 
+    let identity = keystore.identity();
+
     let meta = keystore.meta();
-    let wallet = WalletResult {
+    let wallet = KeystoreResult {
         id: keystore.id(),
         name: meta.name.to_owned(),
-        source: "MNEMONIC".to_owned(),
-        accounts: vec![],
-        created_at: meta.timestamp.clone(),
+        source: Source::NewMnemonic.to_string(),
+        created_at: meta.timestamp,
+        identifier: identity.identifier.to_string(),
+        ipfs_id: identity.ipfs_id.to_string(),
+        source_fingerprint: keystore.fingerprint().to_string(),
     };
+
     let ret = encode_message(wallet)?;
     cache_keystore(keystore);
     Ok(ret)
 }
 
-pub(crate) fn hd_store_import(data: &[u8]) -> Result<Vec<u8>> {
-    let param: HdStoreImportParam =
-        HdStoreImportParam::decode(data).expect("import wallet from mnemonic");
+pub fn import_mnemonic(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ImportMnemonicParam =
+        ImportMnemonicParam::decode(data).expect("import_mnemonic param");
 
     let mut founded_id: Option<String> = None;
     {
-        let key_hash = key_hash_from_mnemonic(&param.mnemonic)?;
+        let fingerprint = fingerprint_from_mnemonic(&param.mnemonic)?;
         let map = KEYSTORE_MAP.read();
         if let Some(founded) = map
             .values()
-            .find(|keystore| keystore.key_hash() == key_hash)
+            .find(|keystore| keystore.fingerprint() == fingerprint)
         {
             founded_id = Some(founded.id());
         }
     }
 
     if founded_id.is_some() && !param.overwrite {
-        return Err(format_err!("{}", "address_already_exist"));
+        return Err(anyhow!("{}", "address_already_exist"));
     }
 
-    let mut meta = Metadata::default();
-    meta.name = param.name.to_owned();
-    meta.password_hint = param.password_hint.to_owned();
-    meta.source = Source::Mnemonic;
+    let meta = Metadata {
+        name: param.name,
+        password_hint: Some(param.password_hint),
+        source: Source::Mnemonic,
+        ..Metadata::default()
+    };
 
     let ks = HdKeystore::from_mnemonic(&param.mnemonic, &param.password, meta)?;
 
     let mut keystore = Keystore::Hd(ks);
 
-    if founded_id.is_some() {
-        keystore.set_id(&founded_id.unwrap());
+    if let Some(id) = founded_id {
+        keystore.set_id(&id);
     }
 
     flush_keystore(&keystore)?;
 
     let meta = keystore.meta();
-    let wallet = WalletResult {
+
+    let identity = keystore.identity();
+
+    let wallet = KeystoreResult {
         id: keystore.id(),
         name: meta.name.to_owned(),
-        source: "MNEMONIC".to_owned(),
-        accounts: vec![],
-        created_at: meta.timestamp.clone(),
+        source: Source::Mnemonic.to_string(),
+        created_at: meta.timestamp,
+        identifier: identity.identifier.to_string(),
+        ipfs_id: identity.ipfs_id.to_string(),
+        source_fingerprint: keystore.fingerprint().to_string(),
     };
     let ret = encode_message(wallet)?;
     cache_keystore(keystore);
     Ok(ret)
 }
 
-#[deprecated(
-    since = "2.5.1",
-    note = "Please use the export_mnemonic function instead"
-)]
-#[allow(deprecated)]
-pub(crate) fn hd_store_export(data: &[u8]) -> Result<Vec<u8>> {
-    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("hd_store_export");
-    let mut map = KEYSTORE_MAP.write();
-    let keystore: &mut Keystore = match map.get_mut(&param.id) {
-        Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
-    }?;
-
-    let guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
-
-    let export_result = KeystoreCommonExportResult {
-        id: guard.keystore().id(),
-        r#type: KeyType::Mnemonic as i32,
-        value: guard.keystore().export()?,
-    };
-
-    encode_message(export_result)
-}
-
-fn enc_xpub(xpub: &str, network: &str) -> Result<String> {
-    let xpk = Bip32DeterministicPublicKey::from_hex(xpub)?;
-    let ext_pub_key: String;
-    if network == "MAINNET" {
-        ext_pub_key = xpk.to_ss58check_with_version(&[0x04, 0x88, 0xB2, 0x1E]);
-    } else {
-        ext_pub_key = xpk.to_ss58check_with_version(&[0x04, 0x35, 0x87, 0xCF]);
-    }
-
-    let key = tcx_crypto::XPUB_COMMON_KEY_128.read();
-    let iv = tcx_crypto::XPUB_COMMON_IV.read();
-    let key_bytes = hex::decode(&*key)?;
-    let iv_bytes = hex::decode(&*iv)?;
-    let encrypted = encrypt_pkcs7(&ext_pub_key.as_bytes(), &key_bytes, &iv_bytes)?;
-    Ok(base64::encode(&encrypted))
-}
-
-pub(crate) fn keystore_common_derive(data: &[u8]) -> Result<Vec<u8>> {
-    let param: KeystoreCommonDeriveParam =
-        KeystoreCommonDeriveParam::decode(data).expect("keystore_common_derive");
+impl_to_key!(crate::api::derive_accounts_param::Key);
+pub fn derive_accounts(data: &[u8]) -> Result<Vec<u8>> {
+    let param: DeriveAccountsParam =
+        DeriveAccountsParam::decode(data).expect("derive_accounts param");
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let mut guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
 
     let mut account_responses: Vec<AccountResponse> = vec![];
 
     for derivation in param.derivations {
         let account = derive_account(guard.keystore_mut(), &derivation)?;
+        let mut coin_info = coin_info_from_param(
+            &derivation.chain_type,
+            &derivation.network,
+            &derivation.seg_wit,
+            &derivation.curve,
+        )?;
+        if !derivation.path.is_empty() {
+            coin_info.derivation_path = derivation.path;
+        }
+
         let enc_xpub = if account.ext_pub_key.is_empty() {
             Ok("".to_string())
         } else {
-            enc_xpub(&account.ext_pub_key.to_string(), &account.network)
+            encrypt_xpub(&account.ext_pub_key.to_string())
         }?;
+
         let account_rsp = AccountResponse {
             chain_type: derivation.chain_type.to_owned(),
             address: account.address.to_owned(),
             path: account.derivation_path.to_owned(),
-            extended_xpub_key: enc_xpub,
+            curve: account.curve.as_str().to_string(),
+            public_key: encode_public_key_internal(&account.public_key, &coin_info)?,
+            extended_public_key: account.ext_pub_key.to_string(),
+            encrypted_extended_public_key: enc_xpub,
+            seg_wit: derivation.seg_wit.to_string(),
         };
         account_responses.push(account_rsp);
     }
 
-    let accounts_rsp = AccountsResponse {
+    let accounts_rsp = DeriveAccountsResult {
         accounts: account_responses,
     };
-    flush_keystore(guard.keystore())?;
     encode_message(accounts_rsp)
 }
 
+impl_to_key!(crate::api::export_mnemonic_param::Key);
+
 pub(crate) fn export_mnemonic(data: &[u8]) -> Result<Vec<u8>> {
-    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("export_mnemonic");
+    let param: ExportMnemonicParam =
+        ExportMnemonicParam::decode(data).expect("export_mnemonic param");
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
+    let guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
 
     tcx_ensure!(
-        guard.keystore().determinable(),
-        format_err!("{}", "private_keystore_cannot_export_mnemonic")
+        guard.keystore().derivable(),
+        anyhow!("{}", "private_keystore_cannot_export_mnemonic")
     );
 
-    let export_result = KeystoreCommonExportResult {
+    let export_result = ExportMnemonicResult {
         id: guard.keystore().id(),
-        r#type: KeyType::Mnemonic as i32,
-        value: guard.keystore().export()?,
+        mnemonic: guard.keystore().export()?,
     };
 
     encode_message(export_result)
 }
 
-fn key_data_from_any_format_pk(pk: &str) -> Result<Vec<u8>> {
-    let decoded = hex::decode(pk.to_string());
-    if decoded.is_ok() {
-        let bytes = decoded.unwrap();
-        if bytes.len() <= 64 {
-            Ok(bytes)
-        } else {
-            // import filecoin
-            Ok(KeyInfo::from_lotus(&bytes)?.decode_private_key()?)
-        }
-    } else {
-        private_key_without_version(pk)
-    }
-}
-
-fn key_hash_from_any_format_pk(pk: &str) -> Result<String> {
-    let key_data = key_data_from_any_format_pk(pk)?;
-    Ok(key_hash_from_private_key(&key_data))
-}
-
-fn key_hash_from_tezos_format_pk(pk: &str) -> Result<String> {
-    let key_data = pars_tezos_private_key(pk)?;
-    Ok(key_hash_from_private_key(&key_data))
-}
-
-pub(crate) fn private_key_store_import(data: &[u8]) -> Result<Vec<u8>> {
-    let param: PrivateKeyStoreImportParam =
-        PrivateKeyStoreImportParam::decode(data).expect("private_key_store_import");
-
-    let mut founded_id: Option<String> = None;
-    {
-        let key_hash: String;
-        if param.encoding.eq("TEZOS") {
-            key_hash = key_hash_from_tezos_format_pk(&param.private_key)?;
-        } else {
-            key_hash = key_hash_from_any_format_pk(&param.private_key)?;
-        }
-        //        let key_hash = key_hash_from_any_format_pk(&param.private_key)?;
-        let map = KEYSTORE_MAP.read();
-        if let Some(founded) = map
-            .values()
-            .find(|keystore| keystore.key_hash() == key_hash)
-        {
-            founded_id = Some(founded.id());
-        }
-    }
-
-    if founded_id.is_some() && !param.overwrite {
-        return Err(format_err!("{}", "address_already_exist"));
-    }
+pub fn import_private_key(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ImportPrivateKeyParam =
+        ImportPrivateKeyParam::decode(data).expect("import_private_key param");
 
-    let pk_bytes: Vec<u8>;
-    if param.encoding.eq("TEZOS") {
-        pk_bytes = pars_tezos_private_key(&param.private_key)?;
-    } else {
-        pk_bytes = key_data_from_any_format_pk(&param.private_key)?;
-    }
-    let private_key = hex::encode(pk_bytes);
-    let meta = Metadata {
-        name: param.name,
-        password_hint: param.password_hint,
-        source: Source::Private,
-        ..Metadata::default()
-    };
-    let pk_store = PrivateKeystore::from_private_key(&private_key, &param.password, meta);
-
-    let mut keystore = Keystore::PrivateKey(pk_store);
-
-    if let Some(exist_kid) = founded_id {
-        keystore.set_id(&exist_kid)
-    }
+    let rsp = import_private_key_internal(&param, None, None)?;
 
-    flush_keystore(&keystore)?;
-
-    let meta = keystore.meta();
-    let wallet = WalletResult {
-        id: keystore.id(),
-        name: meta.name.to_owned(),
-        source: "PRIVATE".to_owned(),
-        accounts: vec![],
-        created_at: meta.timestamp.clone(),
-    };
-    let ret = encode_message(wallet)?;
-    cache_keystore(keystore);
+    let ret = encode_message(rsp)?;
     Ok(ret)
 }
 
-#[deprecated(
-    since = "2.5.1",
-    note = "Please use the export_private_key function instead"
-)]
-pub(crate) fn private_key_store_export(data: &[u8]) -> Result<Vec<u8>> {
-    let param: PrivateKeyStoreExportParam =
-        PrivateKeyStoreExportParam::decode(data).expect("private_key_store_export");
-    let mut map = KEYSTORE_MAP.write();
-    let keystore: &mut Keystore = match map.get_mut(&param.id) {
-        Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
-    }?;
-
-    let guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
-
-    let pk_hex = guard.keystore().export()?;
-
-    // private_key prefix is only about chain type and network
-    let coin_info = coin_info_from_param(&param.chain_type, &param.network, "", "")?;
-    let value = if param.chain_type.as_str() == "TRON" {
-        Ok(pk_hex.to_string())
-    } else if param.chain_type.as_str() == "TEZOS" {
-        Ok(build_tezos_base58_private_key(pk_hex.as_str())?)
-    } else {
-        let bytes = hex::decode(pk_hex.to_string())?;
-        let typed_pk = TypedPrivateKey::from_slice(CurveType::SECP256k1, &bytes)?;
-        typed_pk.fmt(&coin_info)
-    }?;
-
-    let export_result = KeystoreCommonExportResult {
-        id: guard.keystore().id(),
-        r#type: KeyType::PrivateKey as i32,
-        value,
-    };
-
-    encode_message(export_result)
-}
-
+impl_to_key!(crate::api::export_private_key_param::Key);
 pub(crate) fn export_private_key(data: &[u8]) -> Result<Vec<u8>> {
     let param: ExportPrivateKeyParam =
-        ExportPrivateKeyParam::decode(data).expect("export_private_key");
+        ExportPrivateKeyParam::decode(data).expect("export_private_key param");
+
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let mut guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
 
-    let pk_hex = if param.path.is_empty() {
-        guard
-            .keystore_mut()
-            .export_private_key(&param.chain_type, &param.main_address, None)?
-    } else {
-        // get the relative path
-        let mut relative_path: &str = param.path.as_str();
-        if param.path.starts_with("m") {
-            let acc_path = get_account_path(relative_path)?;
-            relative_path = &relative_path[acc_path.len()..];
-        }
-
-        if relative_path.starts_with("/") {
-            relative_path = &relative_path[1..];
-        }
-
-        guard.keystore_mut().export_private_key(
-            &param.chain_type,
-            &param.main_address,
-            Some(relative_path),
-        )?
-    };
-
-    // private_key prefix is only about chain type and network
-    let _coin_info = coin_info_from_param(&param.chain_type, &param.network, "", "")?;
-    let value = if ["TRON", "POLKADOT", "KUSAMA"].contains(&param.chain_type.as_str()) {
-        Ok(pk_hex.to_string())
-    } else if "FILECOIN".contains(&param.chain_type.as_str()) {
-        if let Some(account) = guard
-            .keystore_mut()
-            .account("FILECOIN", &param.main_address)
-        {
-            Ok(hex::encode(
-                KeyInfo::from_private_key(account.curve, &hex::decode(pk_hex)?)?.to_json()?,
-            ))
-        } else {
-            Err(format_err!("{}", "account_not_found"))
-        }
-    } else if "TEZOS".contains(&param.chain_type.as_str()) {
-        Ok(build_tezos_base58_private_key(pk_hex.as_str())?)
+    let curve = CurveType::from_str(&param.curve);
+    let private_key_bytes = guard
+        .keystore_mut()
+        .get_private_key(curve, &param.path)?
+        .to_bytes();
+
+    let value = if ["POLKADOT", "KUSAMA"].contains(&param.chain_type.as_str()) {
+        Ok(private_key_bytes.to_0x_hex())
+    } else if ["TRON", "ETHEREUM"].contains(&param.chain_type.as_str()) {
+        Ok(private_key_bytes.to_hex())
+    } else if "FILECOIN".contains(param.chain_type.as_str()) {
+        Ok(KeyInfo::from_private_key(curve, &private_key_bytes)?
+            .to_json()?
+            .to_hex())
+    } else if "TEZOS".contains(param.chain_type.as_str()) {
+        Ok(encode_tezos_private_key(&private_key_bytes.to_hex())?)
+    } else if "EOS".contains(&param.chain_type) {
+        encode_eos_wif(&private_key_bytes)
     } else {
         // private_key prefix is only about chain type and network
         let coin_info = coin_info_from_param(&param.chain_type, &param.network, "", "")?;
-
-        let bytes = hex::decode(pk_hex.to_string())?;
-        let typed_pk = TypedPrivateKey::from_slice(CurveType::SECP256k1, &bytes)?;
+        let typed_pk = TypedPrivateKey::from_slice(CurveType::SECP256k1, &private_key_bytes)?;
         typed_pk.fmt(&coin_info)
     }?;
 
-    let export_result = KeystoreCommonExportResult {
+    let export_result = ExportPrivateKeyResult {
         id: guard.keystore().id(),
-        r#type: KeyType::PrivateKey as i32,
-        value,
+        private_key: value,
     };
 
     encode_message(export_result)
 }
 
-pub(crate) fn keystore_common_verify(data: &[u8]) -> Result<Vec<u8>> {
-    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("keystore_common_delete");
+pub(crate) fn verify_password(data: &[u8]) -> Result<Vec<u8>> {
+    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("verify_password param");
     let map = KEYSTORE_MAP.read();
     let keystore: &Keystore = match map.get(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    if keystore.verify_password(&param.password) {
-        let rsp = Response {
+    if keystore.verify_password(&param.key.clone().unwrap().into()) {
+        let rsp = GeneralResult {
             is_success: true,
             error: "".to_owned(),
         };
         encode_message(rsp)
     } else {
-        Err(format_err!("{}", "password_incorrect"))
+        Err(anyhow!("{}", "password_incorrect"))
     }
 }
 
-pub(crate) fn keystore_common_delete(data: &[u8]) -> Result<Vec<u8>> {
-    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("keystore_common_delete");
+impl_to_key!(crate::api::wallet_key_param::Key);
+pub(crate) fn delete_keystore(data: &[u8]) -> Result<Vec<u8>> {
+    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("delete_keystore param");
     let mut map = KEYSTORE_MAP.write();
     let keystore: &Keystore = match map.get(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    if keystore.verify_password(&param.password) {
+    if keystore.verify_password(&param.key.clone().unwrap().into()) {
         delete_keystore_file(&param.id)?;
         map.remove(&param.id);
 
-        let rsp = Response {
+        // Used to delete all duplicated mnemonic keystore
+        if let Some(file_ids) = remove_old_keystore_by_id(&param.id.clone()) {
+            for file_id in file_ids {
+                map.remove(&file_id);
+            }
+        }
+
+        // Used to delete all identity keystore if is deleting identity wallet
+        if let Some(all_identity_wallets) = read_all_identity_wallet_ids() {
+            if all_identity_wallets.wallet_ids.contains(&param.id) {
+                if let Some(file_ids) = remove_all_identity_wallets() {
+                    for file_id in file_ids {
+                        map.remove(&file_id);
+                    }
+                }
+            }
+        }
+
+        let rsp = GeneralResult {
             is_success: true,
             error: "".to_owned(),
         };
         encode_message(rsp)
     } else {
-        Err(format_err!("{}", "password_incorrect"))
+        Err(anyhow!("{}", "password_incorrect"))
     }
 }
 
-pub(crate) fn keystore_common_exists(data: &[u8]) -> Result<Vec<u8>> {
-    let param: KeystoreCommonExistsParam =
-        KeystoreCommonExistsParam::decode(data).expect("keystore_common_exists params");
-    let key_hash: String;
-    if param.r#type == KeyType::Mnemonic as i32 {
-        let mnemonic: &str = &param
-            .value
-            .split_whitespace()
-            .collect::<Vec<&str>>()
-            .join(" ");
-        key_hash = key_hash_from_mnemonic(mnemonic)?;
-    } else {
-        if param.encoding.eq("TEZOS") {
-            key_hash = key_hash_from_tezos_format_pk(&param.value)?;
-        } else {
-            key_hash = key_hash_from_any_format_pk(&param.value)?;
-        }
-    }
-    let map = &mut KEYSTORE_MAP.write();
+pub(crate) fn exists_private_key(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ExistsPrivateKeyParam =
+        ExistsPrivateKeyParam::decode(data).expect("exists_private_key param");
+    let fingerprint = fingerprint_from_any_format_pk(&param.private_key)?;
 
-    let founded: Option<&Keystore> = map
-        .values()
-        .find(|keystore| keystore.key_hash() == key_hash);
-    let result: KeystoreCommonExistsResult;
-    if let Some(ks) = founded {
-        result = KeystoreCommonExistsResult {
-            is_exists: true,
-            id: ks.id(),
-        }
-    } else {
-        result = KeystoreCommonExistsResult {
-            is_exists: false,
-            id: "".to_owned(),
-        }
-    }
-    encode_message(result)
+    exists_fingerprint(&fingerprint)
 }
 
-pub(crate) fn keystore_common_accounts(data: &[u8]) -> Result<Vec<u8>> {
-    let param: KeystoreCommonAccountsParam =
-        KeystoreCommonAccountsParam::decode(data).expect("keystore_common_accounts params");
-    let map = KEYSTORE_MAP.read();
-    let keystore: &Keystore = match map.get(&param.id) {
+pub(crate) fn exists_mnemonic(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ExistsMnemonicParam =
+        ExistsMnemonicParam::decode(data).expect("exists_mnemonic param");
+
+    let key_hash = fingerprint_from_mnemonic(&param.mnemonic)?;
+
+    exists_fingerprint(&key_hash)
+}
+
+impl_to_key!(crate::api::sign_param::Key);
+
+pub(crate) fn sign_tx(data: &[u8]) -> Result<Vec<u8>> {
+    let param: SignParam = SignParam::decode(data).expect("sign_tx param");
+
+    let mut map = KEYSTORE_MAP.write();
+    let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let mut accounts: Vec<AccountResponse> = vec![];
-    for account in keystore.accounts() {
-        let enc_xpub = if account.ext_pub_key.is_empty() {
-            "".to_string()
-        } else {
-            enc_xpub(&account.ext_pub_key, &account.network)?
-        };
-        // let enc_xpub = enc_xpub(&account.ext_pub_key, &account.network)?;
-        let acc_rsp = AccountResponse {
-            chain_type: account.coin.to_owned(),
-            address: account.address.to_owned(),
-            path: account.derivation_path.to_owned(),
-            extended_xpub_key: enc_xpub.to_owned(),
-        };
-        accounts.push(acc_rsp);
-    }
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
 
-    let accounts_rsp = AccountsResponse { accounts };
-    encode_message(accounts_rsp)
+    sign_transaction_internal(&param, guard.keystore_mut())
 }
 
-pub(crate) fn sign_tx(data: &[u8]) -> Result<Vec<u8>> {
-    let param: SignParam = SignParam::decode(data).expect("SignTxParam");
+impl_to_key!(crate::api::sign_hashes_param::Key);
+pub(crate) fn sign_hashes(data: &[u8]) -> Result<Vec<u8>> {
+    let param: SignHashesParam = SignHashesParam::decode(data).expect("sign_hashes param");
 
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let mut guard = match param.key.clone().unwrap() {
-        Key::Password(password) => KeystoreGuard::unlock_by_password(keystore, &password)?,
-        Key::DerivedKey(derived_key) => {
-            KeystoreGuard::unlock_by_derived_key(keystore, &derived_key)?
-        }
-    };
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
+
+    let signatures = param
+        .data_to_sign
+        .iter()
+        .map(|data_to_sign| -> Result<String> {
+            let hash = Vec::from_hex_auto(&data_to_sign.hash)?;
+            let sig = guard.keystore_mut().sign_hash(
+                &hash,
+                &data_to_sign.path,
+                &data_to_sign.curve,
+                &data_to_sign.sig_alg,
+            )?;
+            Ok(sig.to_0x_hex())
+        })
+        .collect::<Vec<Result<String>>>();
+    let signatures = signatures.into_iter().collect::<Result<Vec<String>>>()?;
+    encode_message(SignHashesResult { signatures })
+}
+
+impl_to_key!(crate::api::get_public_keys_param::Key);
+pub(crate) fn get_public_keys(data: &[u8]) -> Result<Vec<u8>> {
+    let param: GetPublicKeysParam =
+        GetPublicKeysParam::decode(data).expect("get_public_keys param");
 
-    match param.chain_type.as_str() {
-        "BITCOINCASH" | "LITECOIN" => sign_btc_fork_transaction(&param, guard.keystore_mut()),
-        "TRON" => sign_tron_tx(&param, guard.keystore_mut()),
-        "NERVOS" => sign_nervos_ckb(&param, guard.keystore_mut()),
-        "POLKADOT" | "KUSAMA" => sign_substrate_tx_raw(&param, guard.keystore_mut()),
-        "FILECOIN" => sign_filecoin_tx(&param, guard.keystore_mut()),
-        "TEZOS" => sign_tezos_tx_raw(&param, guard.keystore_mut()),
-        _ => Err(format_err!("unsupported_chain")),
+    let mut map = KEYSTORE_MAP.write();
+    let keystore: &mut Keystore = match map.get_mut(&param.id) {
+        Some(keystore) => Ok(keystore),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
+    }?;
+
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
+
+    let public_keys: Vec<TypedPublicKey> = param
+        .derivations
+        .iter()
+        .map(|derivation| {
+            guard
+                .keystore_mut()
+                .get_public_key(CurveType::from_str(&derivation.curve), &derivation.path)
+                .expect("PublicKeyProcessed")
+        })
+        .collect();
+
+    let mut public_key_strs: Vec<String> = vec![];
+    for idx in 0..param.derivations.len() {
+        let pub_key = &public_keys[idx];
+        let derivation = &param.derivations[idx];
+        let coin_info = CoinInfo {
+            coin: derivation.chain_type.to_string(),
+            derivation_path: derivation.path.to_string(),
+            curve: CurveType::from_str(&derivation.curve),
+            ..Default::default()
+        };
+
+        let public_key_str_ret = encode_public_key_internal(&pub_key, &coin_info);
+
+        let pub_key_str = public_key_str_ret?;
+        public_key_strs.push(pub_key_str);
     }
+
+    encode_message(GetPublicKeysResult {
+        public_keys: public_key_strs,
+    })
 }
 
-pub(crate) fn get_public_key(data: &[u8]) -> Result<Vec<u8>> {
-    let param: PublicKeyParam = PublicKeyParam::decode(data).expect("PublicKeyParam");
+impl_to_key!(crate::api::get_extended_public_keys_param::Key);
+pub(crate) fn get_extended_public_keys(data: &[u8]) -> Result<Vec<u8>> {
+    let param: GetExtendedPublicKeysParam =
+        GetExtendedPublicKeysParam::decode(data).expect("get_extended_public_keys param");
 
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let account = keystore.account(&param.chain_type, &param.address);
-    let mut pub_key = vec![];
-    if let Some(acc) = account {
-        tcx_ensure!(
-            acc.public_key.is_some(),
-            format_err!("account_not_contains_public_key")
-        );
-        pub_key = hex::decode(acc.public_key.clone().unwrap())?;
-    } else {
-        return Err(format_err!("account_not_found"));
-    }
-    let mut ret = PublicKeyResult {
-        id: param.id.to_string(),
-        chain_type: param.chain_type.to_string(),
-        address: param.address.to_string(),
-        public_key: String::new(),
-    };
-    //https://www.rubydoc.info/gems/tezos_client/0.2.1/TezosClient/Crypto
-    let edpk_prefix: Vec<u8> = vec![0x0D, 0x0F, 0x25, 0xD9];
-    match param.chain_type.to_uppercase().as_str() {
-        "TEZOS" => {
-            let to_hash = [edpk_prefix, pub_key].concat();
-            let hashed = dsha256(&to_hash);
-            let hash_with_checksum = [to_hash, hashed[0..4].to_vec()].concat();
-            let edpk = hash_with_checksum.to_base58();
-            ret.public_key = edpk;
-            encode_message(ret)
-        }
-        "ETHEREUM2" => {
-            ret.public_key = hex::encode(pub_key);
-            encode_message(ret)
-        }
-        _ => Err(format_err!("unsupported_chain")),
-    }
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
+
+    let extended_public_keys = param
+        .derivations
+        .iter()
+        .map(|derivation| {
+            let extended_public_key = guard
+                .keystore_mut()
+                .get_deterministic_public_key(
+                    CurveType::from_str(&derivation.curve),
+                    &derivation.path,
+                )
+                .expect("GetExtendedPublicKeysParam");
+            extended_public_key.to_string()
+        })
+        .collect();
+    encode_message(GetExtendedPublicKeysResult {
+        extended_public_keys,
+    })
 }
 
-pub(crate) fn sign_filecoin_tx(param: &SignParam, keystore: &mut Keystore) -> Result<Vec<u8>> {
-    let input: UnsignedMessage = UnsignedMessage::decode(
-        param
-            .input
-            .as_ref()
-            .expect("invalid_message")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("FilecoinTxIn");
-
-    let signed_tx = keystore.sign_transaction(&param.chain_type, &param.address, &input)?;
-    encode_message(signed_tx)
-}
-
-pub(crate) fn sign_btc_fork_transaction(
-    param: &SignParam,
-    keystore: &mut Keystore,
-) -> Result<Vec<u8>> {
-    let input: BtcForkTxInput = BtcForkTxInput::decode(
-        param
-            .input
-            .as_ref()
-            .expect("tx_input")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("BitcoinForkTransactionInput");
-    let coin = coin_info_from_param(&param.chain_type, &input.network, &input.seg_wit, "")?;
-
-    let signed_tx: BtcForkSignedTxOutput = if param.chain_type.as_str() == "BITCOINCASH" {
-        if !BchAddress::is_valid(&input.to, &coin) {
-            return Err(format_err!("address_invalid"));
-        }
-        let tran = BchTransaction::new(input, coin);
-        keystore.sign_transaction(&param.chain_type, &param.address, &tran)?
-    } else if input.seg_wit.as_str() != "NONE" {
-        if !BtcForkAddress::is_valid(&input.to, &coin) {
-            return Err(format_err!("address_invalid"));
-        }
-        let tran = BtcForkSegWitTransaction::new(input, coin);
-        keystore.sign_transaction(&param.chain_type, &param.address, &tran)?
-    } else {
-        if !BtcForkAddress::is_valid(&input.to, &coin) {
-            return Err(format_err!("address_invalid"));
-        }
-        let tran = BtcForkTransaction::new(input, coin);
-        keystore.sign_transaction(&param.chain_type, &param.address, &tran)?
-    };
-    encode_message(signed_tx)
-}
-
-pub(crate) fn sign_nervos_ckb(param: &SignParam, keystore: &mut Keystore) -> Result<Vec<u8>> {
-    let input: CkbTxInput = CkbTxInput::decode(
-        param
-            .input
-            .as_ref()
-            .expect("tx_iput")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("CkbTxInput");
-    let signed_tx = keystore.sign_transaction(&param.chain_type, &param.address, &input)?;
-    encode_message(signed_tx)
-}
-
-pub(crate) fn sign_tron_tx(param: &SignParam, keystore: &mut Keystore) -> Result<Vec<u8>> {
-    let input: TronTxInput = TronTxInput::decode(
-        param
-            .input
-            .as_ref()
-            .expect("tx_input")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("TronTxInput");
-    let signed_tx = keystore.sign_transaction(&param.chain_type, &param.address, &input)?;
-
-    encode_message(signed_tx)
-}
-
-pub(crate) fn tron_sign_message(data: &[u8]) -> Result<Vec<u8>> {
-    let param: SignParam = SignParam::decode(data).expect("SignParam");
+pub(crate) fn sign_message(data: &[u8]) -> Result<Vec<u8>> {
+    let param: SignParam = SignParam::decode(data).expect("sign_message param");
 
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let mut guard = match param.key.unwrap() {
-        Key::Password(password) => KeystoreGuard::unlock_by_password(keystore, &password)?,
-        Key::DerivedKey(derived_key) => {
-            KeystoreGuard::unlock_by_derived_key(keystore, &derived_key)?
-        }
-    };
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
 
-    let input: TronMessageInput = TronMessageInput::decode(
-        param
-            .input
-            .expect("TronMessageInput")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("TronMessageInput");
-    let signed_tx = guard
-        .keystore_mut()
-        .sign_message(&param.chain_type, &param.address, &input)?;
-    encode_message(signed_tx)
+    sign_message_internal(&param, guard.keystore_mut())
 }
 
-pub(crate) fn get_derived_key(data: &[u8]) -> Result<Vec<u8>> {
-    let param: WalletKeyParam = WalletKeyParam::decode(data).unwrap();
-    let mut map = KEYSTORE_MAP.write();
+pub fn get_derived_key(data: &[u8]) -> Result<Vec<u8>> {
+    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("get_derived_key param");
+    let mut map: parking_lot::lock_api::RwLockWriteGuard<
+        '_,
+        parking_lot::RawRwLock,
+        std::collections::HashMap<String, Keystore>,
+    > = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let dk = keystore.get_derived_key(&param.password)?;
+    let Some(api::wallet_key_param::Key::Password(password)) = param.key else {
+        return Err(anyhow!("{}", "get_derived_key need password"));
+    };
+    let dk = keystore.get_derived_key(&password)?;
 
     let ret = DerivedKeyResult {
         id: param.id.to_owned(),
@@ -830,89 +936,169 @@ pub(crate) fn get_derived_key(data: &[u8]) -> Result<Vec<u8>> {
     encode_message(ret)
 }
 
-pub(crate) fn sign_substrate_tx_raw(param: &SignParam, keystore: &mut Keystore) -> Result<Vec<u8>> {
-    let input: SubstrateRawTxIn = SubstrateRawTxIn::decode(
-        param
-            .input
-            .as_ref()
-            .expect("raw_tx_input")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("SubstrateTxIn");
-    let signed_tx = keystore.sign_transaction(&param.chain_type, &param.address, &input)?;
-    encode_message(signed_tx)
-}
-
-pub(crate) fn import_substrate_keystore(data: &[u8]) -> Result<Vec<u8>> {
-    let param: SubstrateKeystoreParam = SubstrateKeystoreParam::decode(data)?;
-    let ks: SubstrateKeystore = serde_json::from_str(&param.keystore)?;
-    let _ = ks.validate()?;
-    let pk = decode_substrate_keystore(&ks, &param.password)?;
-    let pk_import_param = PrivateKeyStoreImportParam {
-        private_key: hex::encode(pk),
-        password: param.password.to_string(),
-        name: ks.meta.name,
-        password_hint: "".to_string(),
-        overwrite: param.overwrite,
-        encoding: "".to_string(),
-    };
-    let param_bytes = encode_message(pk_import_param)?;
-    private_key_store_import(&param_bytes)
+pub(crate) fn import_json(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ImportJsonParam = ImportJsonParam::decode(data).expect("import_json param");
+    if let Ok(parse_v3_result) = key_info_from_v3(&param.json, &param.password) {
+        let (sec_key_bytes, name) = parse_v3_result;
+        // network is required when import wif
+        let pk_import_param = ImportPrivateKeyParam {
+            private_key: sec_key_bytes.to_hex(),
+            password: param.password.to_string(),
+            name,
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: param.overwrite,
+        };
+        let mut ret = import_private_key_internal(
+            &pk_import_param,
+            Some(Source::KeystoreV3),
+            Some(param.json.to_string()),
+        )?;
+        ret.identified_chain_types = vec!["ETHEREUM".to_string()];
+        ret.identified_curve = CurveType::SECP256k1.as_str().to_string();
+        ret.identified_network = "".to_string();
+        encode_message(ret)
+    } else if let Ok(parse_substrate_result) =
+        key_info_from_substrate_keystore(&param.json, &param.password)
+    {
+        let (sec_key_bytes, name) = parse_substrate_result;
+        let pk_import_param = ImportPrivateKeyParam {
+            private_key: sec_key_bytes.to_hex(),
+            password: param.password.to_string(),
+            name,
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: param.overwrite,
+        };
+        let mut ret = import_private_key_internal(
+            &pk_import_param,
+            Some(Source::SubstrateKeystore),
+            Some(param.json.to_string()),
+        )?;
+        ret.identified_chain_types = vec!["KUSAMA".to_string(), "POLKADOT".to_string()];
+        ret.identified_curve = CurveType::SR25519.as_str().to_string();
+        ret.identified_network = "".to_string();
+        return encode_message(ret);
+    } else {
+        return Err(anyhow!("unsupport_chain"));
+    }
 }
 
-pub(crate) fn export_substrate_keystore(data: &[u8]) -> Result<Vec<u8>> {
-    let param: ExportPrivateKeyParam = ExportPrivateKeyParam::decode(data.clone())?;
+pub(crate) fn export_json(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ExportJsonParam = ExportJsonParam::decode(data).expect("export_json param");
     let meta: Metadata;
     {
         let map = KEYSTORE_MAP.read();
 
         let keystore: &Keystore = match map.get(&param.id) {
             Some(keystore) => Ok(keystore),
-            _ => Err(format_err!("{}", "wallet_not_found")),
+            _ => Err(anyhow!("{}", "wallet_not_found")),
         }?;
 
         // !!! Warning !!! HDKeystore only can export raw sr25519 key,
-        // but polkadotjs keystore needs a Ed25519 expanded secret key.
-        if keystore.determinable() {
-            return Err(format_err!("{}", "hd_wallet_cannot_export_keystore"));
+        // but polkadotjs fixtures needs a Ed25519 expanded secret key.
+        // they will generate difference account address
+        if ["POLKADOT".to_string(), "KUSAMA".to_string()].contains(&param.chain_type)
+            && keystore.derivable()
+        {
+            return Err(anyhow!("{}", "only_support_sr25519_keystore"));
         }
-        meta = keystore.meta().clone();
+        meta = keystore.meta();
     }
 
-    let ret = export_private_key(data)?;
-    let export_result: KeystoreCommonExportResult =
-        KeystoreCommonExportResult::decode(ret.as_slice())?;
-    let pk = export_result.value;
-    let pk_bytes = hex::decode(pk)?;
-    let coin = coin_info_from_param(&param.chain_type, &param.network, "", "")?;
+    let curve = if ["POLKADOT".to_string(), "KUSAMA".to_string()].contains(&param.chain_type) {
+        CurveType::SR25519.as_str().to_string()
+    } else {
+        CurveType::SECP256k1.as_str().to_string()
+    };
+
+    let export_pivate_key_param = ExportPrivateKeyParam {
+        id: param.id.to_string(),
+        key: Some(export_private_key_param::Key::Password(
+            param.password.to_owned(),
+        )),
+        chain_type: param.chain_type.to_string(),
+        network: "".to_string(),
+        curve,
+        path: param.path.to_string(),
+    };
+
+    let ret = export_private_key(&encode_message(export_pivate_key_param)?)?;
+    let export_result: ExportPrivateKeyResult = ExportPrivateKeyResult::decode(ret.as_slice())?;
+    let private_key = export_result.private_key;
+    let private_key_bytes = Vec::from_hex_auto(private_key)?;
 
-    let mut substrate_ks = encode_substrate_keystore(&param.password, &pk_bytes, &coin)?;
+    let coin = coin_info_from_param(&param.chain_type, "", "", "")?;
 
-    substrate_ks.meta.name = meta.name;
-    substrate_ks.meta.when_created = meta.timestamp;
-    let keystore_str = serde_json::to_string(&substrate_ks)?;
-    let ret = ExportSubstrateKeystoreResult {
-        keystore: keystore_str,
+    let json_str = match param.chain_type.as_str() {
+        "KUSAMA" | "SUBSTRATE" | "POLKADOT" => {
+            let mut substrate_ks =
+                encode_substrate_keystore(&param.password, &private_key_bytes, &coin)?;
+
+            substrate_ks.meta.name = meta.name;
+            substrate_ks.meta.when_created = meta.timestamp;
+            serde_json::to_string(&substrate_ks)?
+        }
+        "ETHEREUM" => {
+            let keystore = LegacyKeystore::new_v3(&private_key_bytes, &param.password)?;
+            serde_json::to_string(&keystore)?
+        }
+        _ => return Err(anyhow!("unsupported_chain")),
+    };
+
+    let ret = ExportJsonResult {
+        id: param.id,
+        json: json_str,
     };
     encode_message(ret)
 }
 
-pub(crate) fn substrate_keystore_exists(data: &[u8]) -> Result<Vec<u8>> {
-    let param: SubstrateKeystoreParam = SubstrateKeystoreParam::decode(data)?;
-    let ks: SubstrateKeystore = serde_json::from_str(&param.keystore)?;
-    let _ = ks.validate()?;
-    let pk = decode_substrate_keystore(&ks, &param.password)?;
+pub(crate) fn exists_json(data: &[u8]) -> Result<Vec<u8>> {
+    let param: ExistsJsonParam = ExistsJsonParam::decode(data).expect("exists_json param");
 
-    let pk_hex = hex::encode(&pk);
-    let exists_param = KeystoreCommonExistsParam {
-        r#type: KeyType::PrivateKey as i32,
-        value: pk_hex,
-        encoding: "".to_string(),
+    let sec_key_hex = if let Ok(parse_v3_result) = key_info_from_v3(&param.json, &param.password) {
+        let (sec_key_bytes, _) = parse_v3_result;
+        sec_key_bytes.to_hex()
+    } else if let Ok(parse_substrate_result) =
+        key_info_from_substrate_keystore(&param.json, &param.password)
+    {
+        let (sec_key_bytes, _) = parse_substrate_result;
+        sec_key_bytes.to_hex()
+    } else {
+        return Err(anyhow!("decrypt_json_error"));
+    };
+
+    let exists_param = ExistsPrivateKeyParam {
+        private_key: sec_key_hex,
     };
     let exists_param_bytes = encode_message(exists_param)?;
-    keystore_common_exists(&exists_param_bytes)
+    exists_private_key(&exists_param_bytes)
+}
+
+pub(crate) fn backup(data: &[u8]) -> Result<Vec<u8>> {
+    let param: WalletKeyParam = WalletKeyParam::decode(data).expect("backup param");
+
+    let mut map = KEYSTORE_MAP.write();
+    let keystore: &mut Keystore = match map.get_mut(&param.id) {
+        Some(keystore) => Ok(keystore),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
+    }?;
+
+    let original = keystore.backup(&param.key.clone().unwrap().into())?;
+    let fingerprint = match keystore.meta().source {
+        Source::Mnemonic | Source::NewMnemonic => Some(fingerprint_from_mnemonic(&original)?),
+        Source::Private | Source::Wif => Some(fingerprint_from_any_format_pk(&original)?),
+        Source::KeystoreV3 | Source::SubstrateKeystore => None,
+    };
+    if fingerprint.is_none()
+        || fingerprint
+            .unwrap()
+            .eq_ignore_ascii_case(keystore.fingerprint())
+    {
+        encode_message(BackupResult { original })
+    } else {
+        Err(anyhow!("fingerprint_not_match"))
+    }
 }
 
 pub(crate) fn unlock_then_crash(data: &[u8]) -> Result<Vec<u8>> {
@@ -920,62 +1106,150 @@ pub(crate) fn unlock_then_crash(data: &[u8]) -> Result<Vec<u8>> {
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
 
-    let _guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
+    let _guard = keystore.unlock(&param.key.unwrap().into());
     panic!("test_unlock_then_crash");
 }
 
-pub(crate) fn sign_tezos_tx_raw(param: &SignParam, keystore: &mut Keystore) -> Result<Vec<u8>> {
-    let input: TezosRawTxIn = TezosRawTxIn::decode(
-        param
-            .input
-            .as_ref()
-            .expect("raw_tx_input")
-            .value
-            .clone()
-            .as_slice(),
-    )
-    .expect("TezosRawTxIn");
-    let signed_tx = keystore.sign_transaction(&param.chain_type, &param.address, &input)?;
-    encode_message(signed_tx)
+pub(crate) fn encrypt_data_to_ipfs(data: &[u8]) -> Result<Vec<u8>> {
+    let param = EncryptDataToIpfsParam::decode(data).expect("EncryptDataToIpfsParam");
+
+    let map = KEYSTORE_MAP.read();
+    let cipher_text = if let Some(identity_ks) = map
+        .values()
+        .find(|ks| ks.identity().identifier == param.identifier)
+    {
+        identity_ks.identity().encrypt_ipfs(&param.content)?
+    } else {
+        let legacy_identify_path = &format!("{}/identity.json", LEGACY_WALLET_FILE_DIR.read());
+        let legacy_ipfs_info = legacy_ipfs::read_legacy_ipfs_info(&legacy_identify_path)?;
+        ensure!(
+            legacy_ipfs_info.identifier == param.identifier,
+            "wallet_not_found"
+        );
+        identity::encrypt_ipfs_with_enc_key(&legacy_ipfs_info.enc_key, &param.content)?
+    };
+
+    let output = EncryptDataToIpfsResult {
+        identifier: param.identifier.to_string(),
+        encrypted: cipher_text,
+    };
+
+    encode_message(output)
 }
 
-pub(crate) fn zksync_private_key_from_seed(data: &[u8]) -> Result<Vec<u8>> {
-    let param: ZksyncPrivateKeyFromSeedParam = ZksyncPrivateKeyFromSeedParam::decode(data)?;
+pub(crate) fn decrypt_data_from_ipfs(data: &[u8]) -> Result<Vec<u8>> {
+    let param = DecryptDataFromIpfsParam::decode(data).expect("DecryptDataFromIpfsParam");
 
-    let result = private_key_from_seed(hex::decode(param.seed)?.as_slice())
-        .expect("zksync_private_key_from_seed_error");
+    let map = KEYSTORE_MAP.read();
+    let content = if let Some(identity_ks) = map
+        .values()
+        .find(|ks| ks.identity().identifier == param.identifier)
+    {
+        identity_ks.identity().decrypt_ipfs(&param.encrypted)?
+    } else {
+        let legacy_identify_path = &format!("{}/identity.json", LEGACY_WALLET_FILE_DIR.read());
+        let legacy_ipfs_data = legacy_ipfs::read_legacy_ipfs_info(&legacy_identify_path)?;
+        identity::decrypt_ipfs_with_enc_key(
+            &param.encrypted,
+            &legacy_ipfs_data.ipfs_id,
+            &legacy_ipfs_data.enc_key,
+        )?
+    };
 
-    let ret = ZksyncPrivateKeyFromSeedResult {
-        priv_key: hex::encode(result),
+    let output = DecryptDataFromIpfsResult {
+        identifier: param.identifier.to_string(),
+        content,
     };
-    encode_message(ret)
+
+    encode_message(output)
 }
 
-pub(crate) fn zksync_sign_musig(data: &[u8]) -> Result<Vec<u8>> {
-    let param: ZksyncSignMusigParam = ZksyncSignMusigParam::decode(data)?;
+impl_to_key!(crate::api::sign_authentication_message_param::Key);
+pub(crate) fn sign_authentication_message(data: &[u8]) -> Result<Vec<u8>> {
+    let param =
+        SignAuthenticationMessageParam::decode(data).expect("SignAuthenticationMessageParam");
 
-    let sign_result = sign_musig(
-        hex::decode(param.priv_key)?.as_slice(),
-        hex::decode(param.bytes)?.as_slice(),
-    )
-    .expect("zksync_sign_musig_error");
-    let ret = ZksyncSignMusigResult {
-        signature: hex::encode(sign_result),
-    };
-    encode_message(ret)
+    let map = KEYSTORE_MAP.read();
+    let Some(identity_ks) = map.values().find(|ks| ks.identity().identifier == param.identifier) else {
+            return Err(anyhow::anyhow!("identity_not_found"));
+        };
+
+    let unlocker = identity_ks
+        .store()
+        .crypto
+        .use_key(&param.key.clone().unwrap().into())?;
+
+    let signature = identity_ks.identity().sign_authentication_message(
+        param.access_time,
+        &param.device_token,
+        &unlocker,
+    )?;
+
+    encode_message(SignAuthenticationMessageResult {
+        signature,
+        access_time: param.access_time,
+    })
 }
 
-pub(crate) fn zksync_private_key_to_pubkey_hash(data: &[u8]) -> Result<Vec<u8>> {
-    let param: ZksyncPrivateKeyToPubkeyHashParam = ZksyncPrivateKeyToPubkeyHashParam::decode(data)?;
-    let pub_key_hash = private_key_to_pubkey_hash(hex::decode(param.priv_key)?.as_slice())
-        .expect("zksync_private_key_to_pubkey_hash_error");
-    let ret = ZksyncPrivateKeyToPubkeyHashResult {
-        pub_key_hash: hex::encode(pub_key_hash),
+pub fn derive_sub_accounts(data: &[u8]) -> Result<Vec<u8>> {
+    let param: DeriveSubAccountsParam =
+        DeriveSubAccountsParam::decode(data).expect("DeriveSubAccountsParam");
+
+    let curve = CurveType::from_str(&param.curve);
+    let xpub = TypedDeterministicPublicKey::from_ss58check(curve, &param.extended_public_key)?;
+
+    let account_ret: Vec<Result<AccountResponse>> = param
+        .relative_paths
+        .iter()
+        .map(|relative_path| {
+            let mut coin_info = coin_info_from_param(
+                &param.chain_type,
+                &param.network,
+                &param.seg_wit,
+                &param.curve,
+            )?;
+            coin_info.derivation_path = relative_path.to_string();
+            let acc: Account = derive_sub_account(&xpub, &coin_info)?;
+
+            let enc_xpub = encrypt_xpub(&param.extended_public_key.to_string())?;
+
+            let acc_rsp = AccountResponse {
+                chain_type: param.chain_type.to_string(),
+                address: acc.address.to_string(),
+                path: relative_path.to_string(),
+                extended_public_key: param.extended_public_key.to_string(),
+                encrypted_extended_public_key: enc_xpub,
+                public_key: encode_public_key_internal(&acc.public_key, &coin_info)?,
+                curve: param.curve.to_string(),
+                seg_wit: param.seg_wit.to_string(),
+            };
+            Ok(acc_rsp)
+        })
+        .collect();
+
+    let accounts: Vec<AccountResponse> = account_ret
+        .into_iter()
+        .collect::<Result<Vec<AccountResponse>>>()?;
+
+    encode_message(DeriveSubAccountsResult { accounts })
+}
+
+pub fn mnemonic_to_public(data: &[u8]) -> Result<Vec<u8>> {
+    let param = MnemonicToPublicKeyParam::decode(data)?;
+    let public_key = tcx_primitive::mnemonic_to_public(&param.mnemonic, &param.path, &param.curve)?;
+    let coin_info = CoinInfo {
+        derivation_path: param.path,
+        curve: CurveType::from_str(&param.curve),
+        coin: param.encoding,
+        ..Default::default()
     };
-    encode_message(ret)
+    let public_key_str = encode_public_key_internal(&public_key, &coin_info)?;
+    encode_message(MnemonicToPublicKeyResult {
+        public_key: public_key_str,
+    })
 }
 
 pub(crate) fn sign_bls_to_execution_change(data: &[u8]) -> Result<Vec<u8>> {
@@ -983,10 +1257,223 @@ pub(crate) fn sign_bls_to_execution_change(data: &[u8]) -> Result<Vec<u8>> {
     let mut map = KEYSTORE_MAP.write();
     let keystore: &mut Keystore = match map.get_mut(&param.id) {
         Some(keystore) => Ok(keystore),
-        _ => Err(format_err!("{}", "wallet_not_found")),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
     }?;
-    let mut guard = KeystoreGuard::unlock_by_password(keystore, &param.password)?;
+    let mut guard = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
     let result: SignBlsToExecutionChangeResult =
         param.sign_bls_to_execution_change(guard.keystore_mut())?;
     encode_message(result)
 }
+
+impl_to_key!(crate::api::eth_batch_personal_sign_param::Key);
+pub(crate) fn eth_batch_personal_sign(data: &[u8]) -> Result<Vec<u8>> {
+    let param: EthBatchPersonalSignParam = EthBatchPersonalSignParam::decode(data)?;
+
+    let mut map = KEYSTORE_MAP.write();
+    let keystore: &mut Keystore = match map.get_mut(&param.id) {
+        Some(keystore) => Ok(keystore),
+        _ => Err(anyhow!("{}", "wallet_not_found")),
+    }?;
+
+    let mut keystore = KeystoreGuard::unlock(keystore, param.key.clone().unwrap().into())?;
+
+    let signatures = batch_personal_sign(keystore.keystore_mut(), param.data, &param.path)?;
+
+    encode_message(EthBatchPersonalSignResult { signatures })
+}
+
+#[cfg(test)]
+mod tests {
+    use tcx_constants::CurveType;
+    use tcx_keystore::Source;
+
+    use crate::{api::ImportPrivateKeyResult, filemanager::WALLET_FILE_DIR};
+
+    use super::{decode_private_key, scan_keystores};
+    use serial_test::serial;
+
+    #[test]
+    #[serial]
+    fn test_decode_private_key() {
+        let private_key = "cPrsVCDgzf7FLG2NyCrfudbAav4DQt2vs1ZcAqcjZWQ6wi1kp3Uc";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(
+            decoded.chain_types,
+            vec![
+                "BITCOIN".to_string(),
+                "BITCOINCASH".to_string(),
+                "LITECOIN".to_string()
+            ]
+        );
+        assert_eq!(decoded.curve, CurveType::SECP256k1);
+        assert_eq!(decoded.network, "TESTNET".to_string());
+        assert_eq!(decoded.source, Source::Wif);
+
+        let private_key = "KyVt2HDqZbQzApZ7ao3YYK66xgkokRwEnyR94RAE4Pk6gxtMdsrA";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(
+            decoded.chain_types,
+            vec!["BITCOIN".to_string(), "BITCOINCASH".to_string()]
+        );
+        assert_eq!(decoded.curve, CurveType::SECP256k1);
+        assert_eq!(decoded.network, "MAINNET".to_string());
+        assert_eq!(decoded.source, Source::Wif);
+
+        let private_key = "T5L9U2X1xyPawfBz8RzQkfdUuYQ7pWx8cBKPvDnmdMvGCrR7TZEw";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(decoded.chain_types, vec!["LITECOIN".to_string()]);
+        assert_eq!(decoded.curve, CurveType::SECP256k1);
+        assert_eq!(decoded.network, "MAINNET".to_string());
+        assert_eq!(decoded.source, Source::Wif);
+
+        let private_key = "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(decoded.chain_types, vec!["TEZOS".to_string()]);
+        assert_eq!(decoded.curve, CurveType::ED25519);
+        assert_eq!(decoded.network, "".to_string());
+        assert_eq!(decoded.source, Source::Private);
+
+        let private_key = "0x43fe394358d14f2e096f4efe80894b4e51a3fdcb73c06b77e937b80deb8c746b";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(
+            decoded.chain_types,
+            vec![
+                "BITCOIN".to_string(),
+                "ETHEREUM".to_string(),
+                "BITCOINCASH".to_string(),
+                "LITECOIN".to_string(),
+                "EOS".to_string(),
+                "TRON".to_string(),
+                "FILECOIN".to_string(),
+            ]
+        );
+        assert_eq!(decoded.curve, CurveType::SECP256k1);
+        assert_eq!(decoded.network, "".to_string());
+        assert_eq!(decoded.source, Source::Private);
+
+        let private_key = "0x7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(decoded.chain_types, vec!["FILECOIN".to_string()]);
+        assert_eq!(decoded.curve, CurveType::SECP256k1);
+        assert_eq!(decoded.network, "".to_string());
+        assert_eq!(decoded.source, Source::Private);
+
+        let private_key = "0x7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(decoded.chain_types, vec!["FILECOIN".to_string()]);
+        assert_eq!(decoded.curve, CurveType::BLS);
+        assert_eq!(decoded.network, "".to_string());
+        assert_eq!(decoded.source, Source::Private);
+
+        let private_key = "5JLENb318PJDVxdjGp8pvmRigMLSYbCPA4GSPXPwANvGLZE3ukq";
+        let decoded = decode_private_key(&private_key).unwrap();
+        assert_eq!(decoded.chain_types, vec!["EOS".to_string()]);
+        assert_eq!(decoded.curve, CurveType::SECP256k1);
+        assert_eq!(decoded.network, "".to_string());
+        assert_eq!(decoded.source, Source::Wif);
+    }
+
+    #[test]
+    fn test_scan_keystores() {
+        *WALLET_FILE_DIR.write() = "../test-data/scan-keystores-fixtures/".to_string();
+        let result = scan_keystores().unwrap();
+        assert_eq!(result.hd_keystores.len(), 1);
+        let hd = result.hd_keystores.first().unwrap();
+        assert_eq!(hd.id, "1055741c-2904-4973-b7ee-4b69bfd8bcc6");
+        assert_eq!(hd.identifier, "im14x5UYkoqtYbJFTLam7c9Ft4BQiFvJbieKWfK");
+        assert_eq!(hd.ipfs_id, "Qme1RuM33X8SmVjisWS3sP4irqNZv6vuqL3L3T6poZ6c2b");
+        assert_eq!(
+            hd.source_fingerprint,
+            "0x572d4a6f166f1f25e7e1c7da85cf158568de63d2"
+        );
+        assert_eq!(hd.created_at, 1705040852);
+        assert_eq!(hd.source, "MNEMONIC");
+        assert_eq!(hd.name, "test-wallet");
+        assert_eq!(result.private_key_keystores.len(), 4);
+
+        let founded_pk_stores: Vec<&ImportPrivateKeyResult> = result
+            .private_key_keystores
+            .iter()
+            .filter(|x| x.id == "7e1c2c55-5b7f-4a5a-8061-c42b594ceb2f")
+            .collect();
+        let pk = founded_pk_stores.first().unwrap();
+        assert_eq!(pk.identifier, "im14x5LYRt5YsM5iTr2xd6dQ75euijaoDs3nRB2");
+        assert_eq!(pk.ipfs_id, "QmSpWyzy5gkYyJiagFHzfkJwqzDdcjCA3qeu8T3JFd54vZ");
+        assert_eq!(
+            pk.source_fingerprint,
+            "0xc7b60806a2af1e89f107b9410da3ab8a825fe5a2"
+        );
+        assert_eq!(pk.created_at, 1705040730);
+        assert_eq!(pk.source, "PRIVATE");
+        assert_eq!(pk.name, "test_filecoin_import_private_key");
+        assert_eq!(pk.identified_curve, "bls12-381");
+
+        let founded_pk_stores: Vec<&ImportPrivateKeyResult> = result
+            .private_key_keystores
+            .iter()
+            .filter(|x| x.id == "1233134b-8377-4fb0-b06f-56062e858708")
+            .collect();
+        let pk = founded_pk_stores.first().unwrap();
+        assert_eq!(pk.identifier, "im14x5FoX7EWwJ1KkNyfSzjafR6JZ6wqUUVr3mR");
+        assert_eq!(pk.ipfs_id, "QmQmj2fza2Ep3hxZZRoeco3ZKccoP1vvGJ3ddjDrDMV9UF");
+        assert_eq!(
+            pk.source_fingerprint,
+            "0xa27b5222f4f53dee8c446a380cf40370a48992c3"
+        );
+        assert_eq!(pk.created_at, 1705041327);
+        assert_eq!(pk.source, "SUBSTRATE_KEYSTORE");
+        assert_eq!(pk.name, "test account");
+        assert_eq!(pk.identified_curve, "sr25519");
+
+        let founded_pk_stores: Vec<&ImportPrivateKeyResult> = result
+            .private_key_keystores
+            .iter()
+            .filter(|x| x.id == "beb68589-0f0f-41e2-94d9-d78f10a72dec")
+            .collect();
+        let pk = founded_pk_stores.first().unwrap();
+        assert_eq!(pk.identifier, "im14x5UPbCXmU2HMQ8jfeKcCDrQYhDppRYaa5C6");
+        assert_eq!(pk.ipfs_id, "QmczBPUeohPPaE8UnPiESyynPwffBqrn4RqrU6nPJw95VT");
+        assert_eq!(
+            pk.source_fingerprint,
+            "0xe6cfaab9a59ba187f0a45db0b169c21bb48f09b3"
+        );
+        assert_eq!(pk.created_at, 1705040607);
+        assert_eq!(pk.source, "PRIVATE");
+        assert_eq!(pk.name, "test_filecoin_import_private_key");
+        assert_eq!(pk.identified_curve, "secp256k1");
+
+        let founded_pk_stores: Vec<&ImportPrivateKeyResult> = result
+            .private_key_keystores
+            .iter()
+            .filter(|x| x.id == "beb68589-0f0f-41e2-94d9-d78f10a72dec")
+            .collect();
+        let pk = founded_pk_stores.first().unwrap();
+        assert_eq!(pk.identifier, "im14x5UPbCXmU2HMQ8jfeKcCDrQYhDppRYaa5C6");
+        assert_eq!(pk.ipfs_id, "QmczBPUeohPPaE8UnPiESyynPwffBqrn4RqrU6nPJw95VT");
+        assert_eq!(
+            pk.source_fingerprint,
+            "0xe6cfaab9a59ba187f0a45db0b169c21bb48f09b3"
+        );
+        assert_eq!(pk.created_at, 1705040607);
+        assert_eq!(pk.source, "PRIVATE");
+        assert_eq!(pk.name, "test_filecoin_import_private_key");
+        assert_eq!(pk.identified_curve, "secp256k1");
+
+        let founded_pk_stores: Vec<&ImportPrivateKeyResult> = result
+            .private_key_keystores
+            .iter()
+            .filter(|x| x.id == "efcfffb2-9b63-418b-a9d0-ec3600012284")
+            .collect();
+        let pk = founded_pk_stores.first().unwrap();
+        assert_eq!(pk.identifier, "im14x5AU2zU5oRyNdGgNbemdP39ATmu16eVgPFQ");
+        assert_eq!(pk.ipfs_id, "Qmb8K5w1fzdTbjTiATvSecNgZYvbMJ6gJB9JPG254aEY8F");
+        assert_eq!(
+            pk.source_fingerprint,
+            "0x6bd7cc4e20a7de71296b81758d29447dfde9a388"
+        );
+        assert_eq!(pk.created_at, 1705041022);
+        assert_eq!(pk.source, "PRIVATE");
+        assert_eq!(pk.name, "test_tezos_import_private_key_export");
+        assert_eq!(pk.identified_curve, "ed25519");
+    }
+}
diff --git a/token-core/tcx/src/lib.rs b/token-core/tcx/src/lib.rs
index 74f60224..6c442948 100644
--- a/token-core/tcx/src/lib.rs
+++ b/token-core/tcx/src/lib.rs
@@ -1,41 +1,45 @@
+#![feature(more_qualified_paths)]
+#![feature(test)]
+
 use std::ffi::{CStr, CString};
 
 use std::os::raw::c_char;
 
+use anyhow::anyhow;
+use handler::{backup, sign_bls_to_execution_change};
+use migration::{mark_identity_wallets, read_legacy_keystore_mnemonic_path};
 use prost::Message;
 
 pub mod api;
 
-use crate::api::{Response, TcxAction};
+use crate::api::{GeneralResult, TcxAction};
 
 pub mod error_handling;
 pub mod handler;
-use failure::Error;
+pub mod migration;
+use anyhow::Error;
 use std::result;
 
-use crate::error_handling::{landingpad, LAST_BACKTRACE, LAST_ERROR};
-#[allow(deprecated)]
+use crate::error_handling::{landingpad, LAST_ERROR};
 use crate::handler::{
-    encode_message, export_mnemonic, export_private_key, get_derived_key, hd_store_create,
-    hd_store_export, hd_store_import, keystore_common_accounts, keystore_common_delete,
-    keystore_common_derive, keystore_common_exists, keystore_common_verify,
-    private_key_store_export, private_key_store_import, sign_tx, tron_sign_message,
-    unlock_then_crash, zksync_private_key_from_seed, zksync_private_key_to_pubkey_hash,
-    zksync_sign_musig,
+    create_keystore, decrypt_data_from_ipfs, delete_keystore, derive_accounts, derive_sub_accounts,
+    encode_message, encrypt_data_to_ipfs, eth_batch_personal_sign, exists_json, exists_mnemonic,
+    exists_private_key, export_json, export_mnemonic, export_private_key, get_derived_key,
+    get_extended_public_keys, get_public_keys, import_json, import_mnemonic, import_private_key,
+    mnemonic_to_public, sign_authentication_message, sign_hashes, sign_message, sign_tx,
+    unlock_then_crash, verify_password,
 };
+use crate::migration::{migrate_keystore, scan_legacy_keystores};
 
-mod filemanager;
+pub mod filemanager;
+// mod identity;
+mod macros;
 
-use crate::handler::{
-    export_substrate_keystore, get_public_key, import_substrate_keystore,
-    sign_bls_to_execution_change, substrate_keystore_exists,
-};
 use parking_lot::RwLock;
+use tcx_common::{FromHex, ToHex};
 
 extern crate serde_json;
 
-#[macro_use]
-extern crate failure;
 #[macro_use]
 extern crate lazy_static;
 
@@ -45,2911 +49,121 @@ lazy_static! {
 
 pub type Result<T> = result::Result<T, Error>;
 
+/// # Safety
+///
 #[no_mangle]
 pub unsafe extern "C" fn free_const_string(s: *const c_char) {
     if s.is_null() {
         return;
     }
-    CStr::from_ptr(s);
+    let _ = CStr::from_ptr(s);
 }
 
-/// dispatch protobuf rpc call
+/// # Safety
 ///
+/// dispatch protobuf rpc call
 #[allow(deprecated)]
 #[no_mangle]
 pub unsafe extern "C" fn call_tcx_api(hex_str: *const c_char) -> *const c_char {
     let hex_c_str = CStr::from_ptr(hex_str);
     let hex_str = hex_c_str.to_str().expect("parse_arguments to_str");
 
-    let data = hex::decode(hex_str).expect("parse_arguments hex decode");
+    let data = Vec::from_hex(hex_str).expect("parse_arguments hex decode");
     let action: TcxAction = TcxAction::decode(data.as_slice()).expect("decode tcx api");
     let reply: Result<Vec<u8>> = match action.method.to_lowercase().as_str() {
         "init_token_core_x" => landingpad(|| {
             handler::init_token_core_x(&action.param.unwrap().value).unwrap();
             Ok(vec![])
         }),
-        "scan_keystores" => landingpad(|| {
-            handler::scan_keystores().unwrap();
-            Ok(vec![])
+        "scan_legacy_keystores" => landingpad(|| {
+            let ret = scan_legacy_keystores()?;
+            encode_message(ret)
         }),
-        "hd_store_create" => landingpad(|| hd_store_create(&action.param.unwrap().value)),
-        "hd_store_import" => landingpad(|| hd_store_import(&action.param.unwrap().value)),
-        "hd_store_export" => landingpad(|| hd_store_export(&action.param.unwrap().value)),
-        "export_mnemonic" => landingpad(|| export_mnemonic(&action.param.unwrap().value)),
-        "keystore_common_derive" => {
-            landingpad(|| keystore_common_derive(&action.param.unwrap().value))
-        }
-
-        "private_key_store_import" => {
-            landingpad(|| private_key_store_import(&action.param.unwrap().value))
-        }
-        "private_key_store_export" => {
-            landingpad(|| private_key_store_export(&action.param.unwrap().value))
+        "read_keystore_mnemonic_path" => {
+            landingpad(|| read_legacy_keystore_mnemonic_path(&action.param.unwrap().value))
         }
+        "create_keystore" => landingpad(|| create_keystore(&action.param.unwrap().value)),
+        "import_mnemonic" => landingpad(|| import_mnemonic(&action.param.unwrap().value)),
+        "export_mnemonic" => landingpad(|| export_mnemonic(&action.param.unwrap().value)),
+        "derive_accounts" => landingpad(|| derive_accounts(&action.param.unwrap().value)),
+        "import_private_key" => landingpad(|| import_private_key(&action.param.unwrap().value)),
         "export_private_key" => landingpad(|| export_private_key(&action.param.unwrap().value)),
-        "keystore_common_verify" => {
-            landingpad(|| keystore_common_verify(&action.param.unwrap().value))
-        }
-        "keystore_common_delete" => {
-            landingpad(|| keystore_common_delete(&action.param.unwrap().value))
-        }
-        "keystore_common_exists" => {
-            landingpad(|| keystore_common_exists(&action.param.unwrap().value))
-        }
-        "keystore_common_accounts" => {
-            landingpad(|| keystore_common_accounts(&action.param.unwrap().value))
-        }
-
+        "verify_password" => landingpad(|| verify_password(&action.param.unwrap().value)),
+        "delete_keystore" => landingpad(|| delete_keystore(&action.param.unwrap().value)),
+        "exists_mnemonic" => landingpad(|| exists_mnemonic(&action.param.unwrap().value)),
+        "exists_private_key" => landingpad(|| exists_private_key(&action.param.unwrap().value)),
+        "derive_sub_accounts" => landingpad(|| derive_sub_accounts(&action.param.unwrap().value)),
         "sign_tx" => landingpad(|| sign_tx(&action.param.unwrap().value)),
-        "get_public_key" => landingpad(|| get_public_key(&action.param.unwrap().value)),
-
-        "tron_sign_msg" => landingpad(|| tron_sign_message(&action.param.unwrap().value)),
-
-        "substrate_keystore_exists" => {
-            landingpad(|| substrate_keystore_exists(&action.param.unwrap().value))
-        }
-
-        "substrate_keystore_import" => {
-            landingpad(|| import_substrate_keystore(&action.param.unwrap().value))
-        }
-
-        "substrate_keystore_export" => {
-            landingpad(|| export_substrate_keystore(&action.param.unwrap().value))
-        }
+        "sign_msg" => landingpad(|| sign_message(&action.param.unwrap().value)),
+        "exists_json" => landingpad(|| exists_json(&action.param.unwrap().value)),
+        "import_json" => landingpad(|| import_json(&action.param.unwrap().value)),
+        "export_json" => landingpad(|| export_json(&action.param.unwrap().value)),
+        "backup" => landingpad(|| backup(&action.param.unwrap().value)),
 
         // !!! WARNING !!! used for `cache_dk` feature
         "get_derived_key" => landingpad(|| get_derived_key(&action.param.unwrap().value)),
         // !!! WARNING !!! used for test only
         "unlock_then_crash" => landingpad(|| unlock_then_crash(&action.param.unwrap().value)),
-        "zksync_private_key_from_seed" => {
-            landingpad(|| zksync_private_key_from_seed(&action.param.unwrap().value))
+
+        "encrypt_data_to_ipfs" => landingpad(|| encrypt_data_to_ipfs(&action.param.unwrap().value)),
+        "decrypt_data_from_ipfs" => {
+            landingpad(|| decrypt_data_from_ipfs(&action.param.unwrap().value))
+        }
+        "sign_authentication_message" => {
+            landingpad(|| sign_authentication_message(&action.param.unwrap().value))
         }
-        "zksync_sign_musig" => landingpad(|| zksync_sign_musig(&action.param.unwrap().value)),
-        "zksync_private_key_to_pubkey_hash" => {
-            landingpad(|| zksync_private_key_to_pubkey_hash(&action.param.unwrap().value))
+        "migrate_keystore" => landingpad(|| migrate_keystore(&action.param.unwrap().value)),
+
+        "get_extended_public_keys" => {
+            landingpad(|| get_extended_public_keys(&action.param.unwrap().value))
         }
+        "get_public_keys" => landingpad(|| get_public_keys(&action.param.unwrap().value)),
+        "sign_hashes" => landingpad(|| sign_hashes(&action.param.unwrap().value)),
+        "mnemonic_to_public" => landingpad(|| mnemonic_to_public(&action.param.unwrap().value)),
         "sign_bls_to_execution_change" => {
             landingpad(|| sign_bls_to_execution_change(&action.param.unwrap().value))
         }
-        _ => landingpad(|| Err(format_err!("unsupported_method"))),
+        "eth_batch_personal_sign" => {
+            landingpad(|| eth_batch_personal_sign(&action.param.unwrap().value))
+        }
+        "mark_identity_wallets" => {
+            landingpad(|| mark_identity_wallets(&action.param.unwrap().value))
+        }
+        _ => landingpad(|| Err(anyhow!("unsupported_method"))),
     };
     match reply {
         Ok(reply) => {
-            let ret_str = hex::encode(reply);
+            let ret_str = reply.to_hex();
             CString::new(ret_str).unwrap().into_raw()
         }
         _ => CString::new("").unwrap().into_raw(),
     }
 }
 
+/// # Safety
+///
 #[no_mangle]
 pub unsafe extern "C" fn clear_err() {
     LAST_ERROR.with(|e| {
         *e.borrow_mut() = None;
     });
-    LAST_BACKTRACE.with(|e| {
-        *e.borrow_mut() = None;
-    });
 }
 
+/// # Safety
+///
 #[no_mangle]
 pub unsafe extern "C" fn get_last_err_message() -> *const c_char {
     LAST_ERROR.with(|e| {
         if let Some(ref err) = *e.borrow() {
-            let rsp = Response {
+            let rsp = GeneralResult {
                 is_success: false,
                 error: err.to_string(),
             };
             let rsp_bytes = encode_message(rsp).expect("encode error");
-            let ret_str = hex::encode(rsp_bytes);
+            let ret_str = rsp_bytes.to_hex();
             CString::new(ret_str).unwrap().into_raw()
         } else {
             CString::new("").unwrap().into_raw()
         }
     })
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::filemanager::KEYSTORE_MAP;
-    use api::sign_param::Key;
-    use error_handling::Result;
-    use std::ffi::{CStr, CString};
-    use std::fs::remove_file;
-    use std::os::raw::c_char;
-    use std::panic;
-    use std::path::Path;
-
-    use crate::api::keystore_common_derive_param::Derivation;
-    use crate::api::{
-        AccountsResponse, DerivedKeyResult, ExportPrivateKeyParam, HdStoreCreateParam,
-        InitTokenCoreXParam, KeyType, KeystoreCommonAccountsParam, KeystoreCommonDeriveParam,
-        KeystoreCommonExistsParam, KeystoreCommonExistsResult, KeystoreCommonExportResult,
-        PrivateKeyStoreExportParam, PrivateKeyStoreImportParam, PublicKeyParam, PublicKeyResult,
-        Response, SignParam, WalletKeyParam, ZksyncPrivateKeyFromSeedParam,
-        ZksyncPrivateKeyFromSeedResult, ZksyncPrivateKeyToPubkeyHashParam,
-        ZksyncPrivateKeyToPubkeyHashResult, ZksyncSignMusigParam, ZksyncSignMusigResult,
-    };
-    use crate::api::{HdStoreImportParam, WalletResult};
-    use crate::handler::hd_store_import;
-    use crate::handler::{encode_message, private_key_store_import};
-    use prost::Message;
-    use tcx_chain::Keystore;
-    use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
-
-    use std::fs;
-    use tcx_btc_fork::transaction::BtcForkTxInput;
-    use tcx_btc_fork::transaction::Utxo;
-
-    use sp_core::{ByteArray, Public as TraitPublic};
-    use sp_runtime::traits::Verify;
-    use tcx_ckb::{CachedCell, CellInput, CkbTxInput, CkbTxOutput, OutPoint, Script, Witness};
-    use tcx_eth2::transaction::{SignBlsToExecutionChangeParam, SignBlsToExecutionChangeResult};
-    use tcx_filecoin::{SignedMessage, UnsignedMessage};
-    use tcx_substrate::{
-        ExportSubstrateKeystoreResult, SubstrateKeystore, SubstrateKeystoreParam, SubstrateRawTxIn,
-        SubstrateTxOut,
-    };
-    use tcx_tezos::transaction::{TezosRawTxIn, TezosTxOut};
-    use tcx_tron::transaction::{TronMessageInput, TronMessageOutput, TronTxInput, TronTxOutput};
-
-    static OTHER_MNEMONIC: &'static str =
-        "calm release clay imitate top extend close draw quiz refuse shuffle injury";
-
-    fn _to_c_char(str: &str) -> *const c_char {
-        CString::new(str).unwrap().into_raw()
-    }
-
-    fn _to_str(json_str: *const c_char) -> &'static str {
-        let json_c_str = unsafe { CStr::from_ptr(json_str) };
-        json_c_str.to_str().unwrap()
-    }
-
-    fn setup() {
-        let p = Path::new("/tmp/imtoken/wallets");
-        if !p.exists() {
-            fs::create_dir_all(p).expect("shoud create filedir");
-        }
-
-        let param = InitTokenCoreXParam {
-            file_dir: "/tmp/imtoken/wallets".to_string(),
-            xpub_common_key: "B888D25EC8C12BD5043777B1AC49F872".to_string(),
-            xpub_common_iv: "9C0C30889CBCC5E01AB5B2BB88715799".to_string(),
-            is_debug: false,
-        };
-
-        handler::init_token_core_x(&encode_message(param).unwrap()).expect("should init tcx");
-    }
-
-    fn teardown() {
-        let p = Path::new("/tmp/imtoken/wallets");
-        let walk_dir = std::fs::read_dir(p).expect("read dir");
-        for entry in walk_dir {
-            let entry = entry.expect("DirEntry");
-            let fp = entry.path();
-            if !fp
-                .file_name()
-                .expect("file_name")
-                .to_str()
-                .expect("file_name str")
-                .ends_with(".json")
-            {
-                continue;
-            }
-
-            remove_file(fp.as_path()).expect("should remove file");
-        }
-    }
-
-    fn run_test<T>(test: T) -> ()
-    where
-        T: FnOnce() -> () + panic::UnwindSafe,
-    {
-        setup();
-        let result = panic::catch_unwind(|| test());
-        teardown();
-        assert!(result.is_ok())
-    }
-
-    fn import_default_wallet() -> WalletResult {
-        let param = HdStoreImportParam {
-            mnemonic: TEST_MNEMONIC.to_string(),
-            // mnemonic: TEST_MNEMONIC.to_string(),
-            password: TEST_PASSWORD.to_string(),
-            source: "MNEMONIC".to_string(),
-            name: "test-wallet".to_string(),
-            password_hint: "imtoken".to_string(),
-            overwrite: true,
-        };
-        let ret = hd_store_import(&encode_message(param).unwrap()).unwrap();
-        WalletResult::decode(ret.as_slice()).unwrap()
-    }
-
-    fn import_default_pk_store() -> WalletResult {
-        let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-            private_key: "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB".to_string(),
-            password: TEST_PASSWORD.to_string(),
-            name: "import_default_pk_store".to_string(),
-            password_hint: "".to_string(),
-            overwrite: true,
-            encoding: "".to_string(),
-        };
-
-        let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-        WalletResult::decode(ret.as_slice()).unwrap()
-    }
-
-    fn import_filecoin_pk_store() -> WalletResult {
-        let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-            private_key: "f15716d3b003b304b8055d9cc62e6b9c869d56cc930c3858d4d7c31f5f53f14a"
-                .to_string(),
-            password: TEST_PASSWORD.to_string(),
-            name: "import_filecoin_pk_store".to_string(),
-            password_hint: "".to_string(),
-            overwrite: true,
-            encoding: "".to_string(),
-        };
-
-        let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-        WalletResult::decode(ret.as_slice()).unwrap()
-    }
-
-    fn import_and_derive(derivation: Derivation) -> WalletResult {
-        let mut wallet = import_default_wallet();
-
-        let param = KeystoreCommonDeriveParam {
-            id: wallet.id.to_string(),
-            password: TEST_PASSWORD.to_string(),
-            derivations: vec![derivation],
-        };
-
-        let ret = call_api("keystore_common_derive", param).unwrap();
-        let accounts: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-        wallet.accounts = accounts.accounts.clone();
-
-        wallet
-    }
-
-    fn import_pk_and_derive(derivation: Derivation) -> WalletResult {
-        let mut wallet = import_default_pk_store();
-
-        let param = KeystoreCommonDeriveParam {
-            id: wallet.id.to_string(),
-            password: TEST_PASSWORD.to_string(),
-            derivations: vec![derivation],
-        };
-
-        let ret = call_api("keystore_common_derive", param).unwrap();
-        let accounts: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-        wallet.accounts = accounts.accounts.clone();
-
-        wallet
-    }
-
-    fn call_api(method: &str, msg: impl Message) -> Result<Vec<u8>> {
-        let param = TcxAction {
-            method: method.to_string(),
-            param: Some(::prost_types::Any {
-                type_url: "imtoken".to_string(),
-                value: encode_message(msg).unwrap(),
-            }),
-        };
-        let _ = unsafe { clear_err() };
-        let param_bytes = encode_message(param).unwrap();
-        let param_hex = hex::encode(param_bytes);
-        let ret_hex = unsafe { _to_str(call_tcx_api(_to_c_char(&param_hex))) };
-        let err = unsafe { _to_str(get_last_err_message()) };
-        if !err.is_empty() {
-            let err_bytes = hex::decode(err).unwrap();
-            let err_ret: Response = Response::decode(err_bytes.as_slice()).unwrap();
-            Err(format_err!("{}", err_ret.error))
-        } else {
-            Ok(hex::decode(ret_hex).unwrap())
-        }
-    }
-
-    #[test]
-    fn test_call_tcx_api() {
-        run_test(|| {
-            let _import_param = HdStoreImportParam {
-                mnemonic: TEST_MNEMONIC.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                source: "MNEMONIC".to_string(),
-                name: "call_tcx_api".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-            };
-            // let ret_bytes = call_api("hd_store_import", import_param).unwrap();
-            let ret_bytes = hex::decode("0a2434656239623136392d323237392d343439332d616535342d62396233643761303630323512036161611a084d4e454d4f4e494328e9a1a2f305").unwrap();
-            let ret: WalletResult = WalletResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(ret.accounts.is_empty())
-        });
-    }
-
-    #[test]
-    pub fn test_scan_keystores() {
-        let param = InitTokenCoreXParam {
-            file_dir: "../test-data".to_string(),
-            xpub_common_key: "B888D25EC8C12BD5043777B1AC49F872".to_string(),
-            xpub_common_iv: "9C0C30889CBCC5E01AB5B2BB88715799".to_string(),
-            is_debug: true,
-        };
-
-        handler::init_token_core_x(&encode_message(param).unwrap()).expect("should init tcx");
-
-        let keystore_count;
-        {
-            let mut map = KEYSTORE_MAP.write();
-            keystore_count = map.len();
-            map.clear();
-            assert_eq!(0, map.len());
-        }
-        let empty = WalletKeyParam {
-            id: "".to_string(),
-            password: "".to_string(),
-        };
-        let _ = call_api("scan_keystores", empty);
-        {
-            let map = KEYSTORE_MAP.write();
-
-            assert_eq!(keystore_count, map.len());
-        }
-    }
-
-    #[test]
-    pub fn test_hd_store_create() {
-        run_test(|| {
-            let param = HdStoreCreateParam {
-                password: TEST_PASSWORD.to_string(),
-                password_hint: "".to_string(),
-                name: "aaa".to_string(),
-            };
-
-            let ret = call_api("hd_store_create", param).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            assert!(import_result.accounts.is_empty());
-            assert_eq!(import_result.name, "aaa");
-            assert_eq!(import_result.source, "MNEMONIC");
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_hd_store_import() {
-        run_test(|| {
-            let import_result: WalletResult = import_default_wallet();
-            assert_eq!(import_result.source, "MNEMONIC");
-            let derivation = Derivation {
-                chain_type: "BITCOINCASH".to_string(),
-                path: "m/44'/145'/0'/0/0".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "NONE".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let result: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-            assert_eq!(result.accounts.first().unwrap().chain_type, "BITCOINCASH");
-            assert_eq!(
-                result.accounts.first().unwrap().address,
-                "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r"
-            );
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_hd_store_import_invalid_params() {
-        run_test(|| {
-            let invalid_mnemonics = vec![
-                "inject kidney empty canal shadow pact comfort wife crush horse",
-                "inject kidney empty canal shadow pact comfort wife crush horse wife wife",
-                "inject kidney empty canal shadow pact comfort wife crush horse hello",
-            ];
-            for mn in invalid_mnemonics {
-                let param = HdStoreImportParam {
-                    mnemonic: mn.to_string(),
-                    password: TEST_PASSWORD.to_string(),
-                    source: "MNEMONIC".to_string(),
-                    name: "test-wallet".to_string(),
-                    password_hint: "imtoken".to_string(),
-                    overwrite: true,
-                };
-
-                let ret = call_api("hd_store_import", param);
-                assert!(ret.is_err());
-            }
-        })
-    }
-
-    #[test]
-    pub fn test_hd_store_import_ltc() {
-        run_test(|| {
-            let import_result: WalletResult = import_default_wallet();
-
-            let derivation = Derivation {
-                chain_type: "LITECOIN".to_string(),
-                path: "m/44'/1'/0'/0/0".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "NONE".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let result: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-            assert_eq!(result.accounts.first().unwrap().chain_type, "LITECOIN");
-            assert_eq!(
-                result.accounts.first().unwrap().address,
-                "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN"
-            );
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_hd_store_export() {
-        run_test(|| {
-            let wallet = import_default_wallet();
-
-            let param = WalletKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-            let ret = call_api("hd_store_export", param).unwrap();
-            let result: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(result.r#type, KeyType::Mnemonic as i32);
-            assert_eq!(result.value, TEST_MNEMONIC);
-        })
-    }
-
-    #[test]
-    pub fn test_export_mnemonic() {
-        run_test(|| {
-            let wallet = import_default_wallet();
-
-            let param = WalletKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-            let ret = call_api("export_mnemonic", param).unwrap();
-            let result: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(result.r#type, KeyType::Mnemonic as i32);
-            assert_eq!(result.value, TEST_MNEMONIC);
-
-            let wallet = import_default_pk_store();
-
-            let param = WalletKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-            unsafe { clear_err() };
-            let ret = call_api("export_mnemonic", param);
-            assert!(ret.is_err());
-            assert_eq!(
-                format!("{}", ret.err().unwrap()),
-                "private_keystore_cannot_export_mnemonic"
-            );
-        })
-    }
-
-    #[test]
-    pub fn test_keystore_common_store_derive() {
-        run_test(|| {
-            let param = HdStoreImportParam {
-                mnemonic: OTHER_MNEMONIC.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                source: "MNEMONIC".to_string(),
-                name: "test-wallet".to_string(),
-                password_hint: "imtoken".to_string(),
-                overwrite: true,
-            };
-            let ret = call_api("hd_store_import", param).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            let derivations = vec![
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "m/44'/2'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "m/49'/2'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "P2WPKH".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "m/49'/1'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "TRON".to_string(),
-                    path: "m/44'/195'/0'/0/0".to_string(),
-                    network: "".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "NERVOS".to_string(),
-                    path: "m/44'/309'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "KUSAMA".to_string(),
-                    path: "//kusama//imToken/0".to_string(),
-                    network: "".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "POLKADOT".to_string(),
-                    path: "//polkadot//imToken/0".to_string(),
-                    network: "".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "FILECOIN".to_string(),
-                    path: "m/44'/461'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "SECP256k1".to_string(),
-                },
-                Derivation {
-                    chain_type: "FILECOIN".to_string(),
-                    path: "m/12381/461/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "BLS".to_string(),
-                },
-                Derivation {
-                    chain_type: "ETHEREUM2".to_string(),
-                    path: "m/12381/3600/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "BLS".to_string(),
-                },
-            ];
-
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(10, derived_accounts.accounts.len());
-            assert_eq!(
-                "LQ3JqCohgLQ3x1CJXYERnJTy1ySaqr1E32",
-                derived_accounts.accounts[0].address
-            );
-            assert_eq!("/EhDRyPFcj1UGx8i+WiJSIeBSyaN0pX7Oq3wXqwO5M9T1aRhfLpsNPGAPLf07K+p+B0OdQW1ogVbDQCWkIwVXZLPY+njp9LjXaICiWGEeidR1TwBZSwOMRKE68wJWH/7puxYfY/Rq1+d2GFv6NxSCw==", derived_accounts.accounts[0].extended_xpub_key);
-
-            assert_eq!(
-                "MQUu6P7wsLQZfVZMuFWB7UXiheuVTM7RYF",
-                derived_accounts.accounts[1].address
-            );
-            assert_eq!("A5LUzJcPB4r54wqr8EjFh9fe0L87spIN9KJKtzHV6QJXBH6GEAiYT57uftpJITx613HdIXXzi8VJ30TmG8erBF30oD1DnbDmGmDo4sdRTdQSsp9NuprhZ3Y3PR9+xzdc2tKDblRL5dLZswaPxCOQcw==", derived_accounts.accounts[1].extended_xpub_key);
-
-            assert_eq!(
-                "mvdDMnRsqjqzvCyYyRXpvscmnU1FxodhkE",
-                derived_accounts.accounts[2].address
-            );
-            assert_eq!("eZIL4e0a8qw18Pve92iLfehteHDA+kqjwv91aKE+2hNN3arkq20yY2Mx6q4WAowFv0QRfIi6QlrhafJKUpjiC469NNZagCSHLaECYliEwmwTgC97zXmVJDB6MJi79y+mznf8G7Few8+u6UfiXELN5g==", derived_accounts.accounts[2].extended_xpub_key);
-
-            assert_eq!(
-                "TLZnqkrSNLUWNrZMug8u9b6pJ3XcTGbzDV",
-                derived_accounts.accounts[3].address
-            );
-            assert_eq!("Sla41n5BdHqc1QmqA9DXjWNx13Fpq18u19jCaMbYbxClsPr7cr/gzXsbE+08wfNLuGgtVVY4/prpnv3/pdJ8KA/I/iOKvelKxuJgN9n2O5Q54CmObc0qJVZxcAQM0PbrKE9YJyGDkJNMLM+OmjEwjg==", derived_accounts.accounts[3].extended_xpub_key);
-
-            assert_eq!(
-                "ckt1qyqgkffut7e7md39tp5ts9vxssj7wdw8z4cquyflka",
-                derived_accounts.accounts[4].address
-            );
-
-            assert_eq!(
-                "HFEP5ePp69xrCLTYcDnzqJTgmH87RUKprkoRUuEmu9Tk49s",
-                derived_accounts.accounts[5].address
-            );
-            assert_eq!(
-                "13GVaZUS28zTCroTPq8dyppfm8F4cAvoJsSZ3yvmtyRYLSLJ",
-                derived_accounts.accounts[6].address
-            );
-            assert_eq!(
-                "t1k7yhkb42jhgrsx4nhr7rfkxfiahmkyxq5cw74ry",
-                derived_accounts.accounts[7].address
-            );
-            // assert_eq!(
-            //     "t3virna6zi3ju2kxsd4zcvlzk7hemm6dsfq47ikggpnmpu43sqzt6yi5remdrt3j62nex7vx254d3767fot7jq",
-            //     derived_accounts.accounts[8].address
-            // );
-            assert_eq!(
-                "a9bedcb23b8ea49d9171a75eacaa90733df0c5e92be5298c2e2e3d001afc0a9ba99e146796cf1d6e93b1778c3e89edac",
-                derived_accounts.accounts[9].address
-            );
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_hd_store_derive_invalid_param() {
-        run_test(|| {
-            let import_result: WalletResult = import_default_wallet();
-
-            let invalid_derivations = vec![
-                Derivation {
-                    chain_type: "WRONG_CHAIN_TYPE".to_string(),
-                    path: "m/44'/2'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "WRONG/PATH".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "P2WPKH".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "49'/1'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-            ];
-            for derivation in invalid_derivations {
-                let param = KeystoreCommonDeriveParam {
-                    id: import_result.id.to_string(),
-                    password: TEST_PASSWORD.to_string(),
-                    derivations: vec![derivation],
-                };
-                let ret = call_api("keystore_common_derive", param);
-                assert!(ret.is_err());
-            }
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_private_key_store_import() {
-        run_test(|| {
-            let import_result: WalletResult = import_default_pk_store();
-
-            assert_eq!(0, import_result.accounts.len());
-
-            let derivations = vec![
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "m/44'/2'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "m/49'/2'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "P2WPKH".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "LITECOIN".to_string(),
-                    path: "m/49'/1'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "TRON".to_string(),
-                    path: "m/44'/195'/0'/0/0".to_string(),
-                    network: "".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "NERVOS".to_string(),
-                    path: "m/44'/309'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-            ];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(5, derived_accounts.accounts.len());
-            assert_eq!(
-                "LgGNTHMkgETS7oQcoekvACJQcH355xECog",
-                derived_accounts.accounts[0].address
-            );
-            assert_eq!("", derived_accounts.accounts[0].extended_xpub_key);
-
-            assert_eq!(
-                "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW",
-                derived_accounts.accounts[1].address
-            );
-            assert_eq!("", derived_accounts.accounts[1].extended_xpub_key);
-
-            assert_eq!(
-                "n2ZNV88uQbede7C5M5jzi6SyG4GVuPpng6",
-                derived_accounts.accounts[2].address
-            );
-            assert_eq!("", derived_accounts.accounts[2].extended_xpub_key);
-
-            assert_eq!(
-                "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG",
-                derived_accounts.accounts[3].address
-            );
-            assert_eq!("", derived_accounts.accounts[3].extended_xpub_key);
-
-            assert_eq!(
-                "ckt1qyqpavderq5jjxh6qhxeks4t706kglffkyassx7h5z",
-                derived_accounts.accounts[4].address
-            );
-
-            //            assert_eq!(
-            //                "ckt1qyqpavderq5jjxh6qhxeks4t706kglffkyassx7h5z",
-            //                derived_accounts.accounts[5].address
-            //            );
-
-            // pk rederive
-            let derivations = vec![Derivation {
-                chain_type: "LITECOIN".to_string(),
-                path: "m/44'/2'/0'/0/0".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "NONE".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "LgGNTHMkgETS7oQcoekvACJQcH355xECog",
-                derived_accounts.accounts[0].address
-            );
-            assert_eq!("", derived_accounts.accounts[0].extended_xpub_key);
-
-            let param = KeystoreCommonAccountsParam {
-                id: import_result.id.to_string(),
-            };
-            let accounts_ret = call_api("keystore_common_accounts", param).unwrap();
-            let ret = AccountsResponse::decode(accounts_ret.as_slice()).unwrap();
-            assert_eq!(5, ret.accounts.len());
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_tezos_private_key_store_import_export() {
-        run_test(|| {
-            let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-                private_key: "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH".to_string(),
-                password: TEST_PASSWORD.to_string(),
-                name: "test_tezos_private_key_store_import_export".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-                encoding: "TEZOS".to_string(),
-            };
-
-            let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-            assert_eq!(0, import_result.accounts.len());
-
-            let derivations = vec![Derivation {
-                chain_type: "TEZOS".to_string(),
-                path: "m/44'/1729'/0'/0'".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy",
-                derived_accounts.accounts[0].address
-            );
-
-            let param: KeystoreCommonExistsParam = KeystoreCommonExistsParam {
-                r#type: KeyType::PrivateKey as i32,
-                value: "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH"
-                    .to_string(),
-                encoding: "TEZOS".to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_exists", param).unwrap();
-            let result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(result.is_exists);
-            assert_eq!(result.id, import_result.id);
-
-            let param: PrivateKeyStoreExportParam = PrivateKeyStoreExportParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "TEZOS".to_string(),
-                network: "MAINNET".to_string(),
-            };
-            let ret_bytes = call_api("private_key_store_export", param).unwrap();
-            let export_result: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH",
-                export_result.value
-            );
-
-            let param: PublicKeyParam = PublicKeyParam {
-                id: import_result.id.to_string(),
-                chain_type: "TEZOS".to_string(),
-                address: "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy".to_string(),
-            };
-            let ret_bytes = call_api("get_public_key", param).unwrap();
-            let public_key_result: PublicKeyResult =
-                PublicKeyResult::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "edpkvQtuhdZQmjdjVfaY9Kf4hHfrRJYugaJErkCGvV3ER1S7XWsrrj",
-                public_key_result.public_key
-            );
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_tezos_hd_private_key_import_export() {
-        run_test(|| {
-            let import_result: WalletResult = import_default_pk_store();
-
-            assert_eq!(0, import_result.accounts.len());
-
-            let derivations = vec![Derivation {
-                chain_type: "TEZOS".to_string(),
-                path: "m/44'/1729'/0'/0'".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "tz1RTCY2tQdBCWYacqmV18UYy5YMBdCgcpL1",
-                derived_accounts.accounts[0].address
-            );
-
-            let export_param = ExportPrivateKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "TEZOS".to_string(),
-                network: "".to_string(),
-                main_address: derived_accounts.accounts[0].address.to_string(),
-                path: "m/44'/1729'/0'/0'".to_string(),
-            };
-
-            let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
-            let export_pk: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(export_pk_bytes.as_slice()).unwrap();
-            println!("{:#?}", export_pk.value);
-            // assert_eq!(
-            //     export_pk.value,
-            //     "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d"
-            // );
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_filecoin_private_key_secp256k1_import() {
-        run_test(|| {
-            let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-                private_key: "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d"
-                    .to_string(),
-                password: TEST_PASSWORD.to_string(),
-                name: "test_filecoin_private_key_store_import".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-                encoding: "".to_string(),
-            };
-
-            let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(0, import_result.accounts.len());
-
-            let derivations = vec![Derivation {
-                chain_type: "FILECOIN".to_string(),
-                path: "".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "SECP256k1".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-
-            assert_eq!(1, derived_accounts.accounts.len());
-
-            assert_eq!(
-                "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i",
-                derived_accounts.accounts[0].address
-            );
-
-            let export_param = ExportPrivateKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "FILECOIN".to_string(),
-                network: "".to_string(),
-                main_address: "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i".to_string(),
-                path: "".to_string(),
-            };
-
-            let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
-            let export_pk: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(export_pk_bytes.as_slice()).unwrap();
-            assert_eq!(
-                export_pk.value,
-                "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d"
-            );
-
-            remove_created_wallet(&import_result.id);
-        });
-    }
-
-    #[test]
-    pub fn test_filecoin_private_key_bls_import() {
-        run_test(|| {
-            let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-                private_key: "7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d"
-                    .to_string(),
-                password: TEST_PASSWORD.to_string(),
-                name: "test_filecoin_private_key_store_import".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-                encoding: "".to_string(),
-            };
-
-            let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(0, import_result.accounts.len());
-
-            let derivations = vec![Derivation {
-                chain_type: "FILECOIN".to_string(),
-                path: "".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "BLS".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(1, derived_accounts.accounts.len());
-
-            assert_eq!(
-                "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa",
-                derived_accounts.accounts[0].address
-            );
-
-            let export_param = ExportPrivateKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "FILECOIN".to_string(),
-                network: "".to_string(),
-                main_address: "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa".to_string(),
-                path: "".to_string(),
-            };
-
-            let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
-            let export_pk: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(export_pk_bytes.as_slice()).unwrap();
-            assert_eq!(
-                export_pk.value,
-                "7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d"
-            );
-
-            remove_created_wallet(&import_result.id);
-        });
-    }
-
-    #[test]
-    pub fn test_64bytes_private_key_store_import() {
-        run_test(|| {
-            let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-                private_key: "416c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f"
-                    .to_string(),
-                password: TEST_PASSWORD.to_string(),
-                name: "test_64bytes_private_key_store_import".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-                encoding: "".to_string(),
-            };
-
-            let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(0, import_result.accounts.len());
-
-            let derivations = vec![Derivation {
-                chain_type: "POLKADOT".to_string(),
-                path: "".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(1, derived_accounts.accounts.len());
-
-            assert_eq!(
-                "133smEABgtt8FRkZGrZfAzCV522bxo2y5FwVoTcSaY8z1nEq",
-                derived_accounts.accounts[0].address
-            );
-
-            let export_param = ExportPrivateKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "POLKADOT".to_string(),
-                network: "".to_string(),
-                main_address: "133smEABgtt8FRkZGrZfAzCV522bxo2y5FwVoTcSaY8z1nEq".to_string(),
-                path: "".to_string(),
-            };
-
-            let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
-            let export_pk: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(export_pk_bytes.as_slice()).unwrap();
-            assert_eq!(
-                export_pk.value,
-                "416c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f"
-            );
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_private_key_store_export() {
-        run_test(|| {
-            let import_result: WalletResult = import_default_pk_store();
-            let param: PrivateKeyStoreExportParam = PrivateKeyStoreExportParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "BITCOINCASH".to_string(),
-                network: "MAINNET".to_string(),
-            };
-            let ret_bytes = call_api("private_key_store_export", param).unwrap();
-            let export_result: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
-                export_result.value
-            );
-            assert_eq!(KeyType::PrivateKey as i32, export_result.r#type);
-
-            let param: PrivateKeyStoreExportParam = PrivateKeyStoreExportParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "BITCOINCASH".to_string(),
-                network: "TESTNET".to_string(),
-            };
-            let ret_bytes = call_api("private_key_store_export", param).unwrap();
-            let export_result: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "cT4fTJyLd5RmSZFHnkGmVCzXDKuJLbyTt7cy77ghTTCagzNdPH1j",
-                export_result.value
-            );
-            assert_eq!(KeyType::PrivateKey as i32, export_result.r#type);
-
-            let param: PrivateKeyStoreExportParam = PrivateKeyStoreExportParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "TRON".to_string(),
-                network: "".to_string(),
-            };
-            let ret_bytes = call_api("private_key_store_export", param).unwrap();
-            let export_result: KeystoreCommonExportResult =
-                KeystoreCommonExportResult::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
-                export_result.value
-            );
-            assert_eq!(KeyType::PrivateKey as i32, export_result.r#type);
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_export_private_key() {
-        run_test(|| {
-            let derivations = vec![
-                Derivation {
-                    chain_type: "BITCOINCASH".to_string(),
-                    path: "".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "BITCOINCASH".to_string(),
-                    path: "".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "TRON".to_string(),
-                    path: "".to_string(),
-                    network: "".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "FILECOIN".to_string(),
-                    path: "".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "SECP256k1".to_string(),
-                },
-            ];
-            let pks = vec![
-                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
-                "cT4fTJyLd5RmSZFHnkGmVCzXDKuJLbyTt7cy77ghTTCagzNdPH1j",
-                "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
-                "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d",
-            ];
-
-            for idx in 0..4 {
-                let import_result: WalletResult = import_pk_and_derive(derivations[idx].clone());
-                let acc = import_result.accounts.first().unwrap().clone();
-                let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
-                    id: import_result.id.to_string(),
-                    password: TEST_PASSWORD.to_string(),
-                    chain_type: acc.chain_type.to_string(),
-                    network: derivations[idx].network.to_string(),
-                    main_address: acc.address.clone(),
-                    path: "".to_string(),
-                };
-                let ret_bytes = call_api("export_private_key", param).unwrap();
-                let export_result: KeystoreCommonExportResult =
-                    KeystoreCommonExportResult::decode(ret_bytes.as_slice()).unwrap();
-
-                // test export as mainnet
-                assert_eq!(pks[idx], export_result.value);
-                assert_eq!(KeyType::PrivateKey as i32, export_result.r#type);
-                remove_created_wallet(&import_result.id);
-            }
-
-            let wallet = import_default_pk_store();
-            let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "LITECOIN".to_string(),
-                network: "MAINNET".to_string(),
-                main_address: "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP".to_string(),
-                path: "".to_string(),
-            };
-            let ret = call_api("export_private_key", param);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "account_not_found");
-        })
-    }
-
-    #[test]
-    pub fn test_export_private_key_from_hd_store() {
-        run_test(|| {
-            let derivations = vec![
-                Derivation {
-                    chain_type: "BITCOINCASH".to_string(),
-                    path: "m/44'/145'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "BITCOINCASH".to_string(),
-                    path: "m/44'/145'/0'/0/0".to_string(),
-                    network: "MAINNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "BITCOINCASH".to_string(),
-                    path: "m/44'/1'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "TRON".to_string(),
-                    path: "m/44'/195'/0'/0/0".to_string(),
-                    network: "".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                },
-                Derivation {
-                    chain_type: "FILECOIN".to_string(),
-                    path: "m/44'/461'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "SECP256k1".to_string(),
-                },
-            ];
-
-            let pks = vec![
-                "L39VXyorp19JfsEJfbD7Tfr4pBEX93RJuVXW7E13C51ZYAhUWbYa",
-                "KyLGdagds7tY1vupT5Kf8C1Cc5wkzzWRK51e4vsh1svCSvYk4Abo",
-                "cN4b1V3cicEexrYXiEhaWEdURyhZiVX6PzAZNFSzZaWfSNZG2cJX",
-                "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171",
-                "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a222f5059574777574e577a58614d5675437a613958502b314b4a695a4474696f4c76777863754268783041553d227d",
-            ];
-            let export_paths = vec![
-                "m/44'/145'/0'/0/0",
-                "m/44'/145'/0'/0/1",
-                "m/44'/1'/0'/0/1",
-                "m/44'/195'/0'/0/1",
-                "m/44'/461'/0'/0/0",
-            ];
-
-            for idx in 0..derivations.len() {
-                let import_result: WalletResult = import_and_derive(derivations[idx].clone());
-                let acc = import_result.accounts.first().unwrap().clone();
-                let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
-                    id: import_result.id.to_string(),
-                    password: TEST_PASSWORD.to_string(),
-                    chain_type: acc.chain_type.to_string(),
-                    network: derivations[idx].network.to_string(),
-                    main_address: acc.address.to_string(),
-                    path: export_paths[idx].to_string(),
-                };
-                let ret_bytes = call_api("export_private_key", param).unwrap();
-                let export_result: KeystoreCommonExportResult =
-                    KeystoreCommonExportResult::decode(ret_bytes.as_slice()).unwrap();
-
-                assert_eq!(pks[idx], export_result.value);
-                assert_eq!(KeyType::PrivateKey as i32, export_result.r#type);
-                remove_created_wallet(&import_result.id);
-            }
-
-            let import_result: WalletResult = import_default_wallet();
-
-            let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "LITECOIN".to_string(),
-                network: "MAINNET".to_string(),
-                main_address: "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP".to_string(),
-                path: "m/44'/2'/0'/0/0".to_string(),
-            };
-            let ret = call_api("export_private_key", param);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "account_not_found");
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_import_to_pk_which_from_hd() {
-        run_test(|| {
-            let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-                private_key: "L39VXyorp19JfsEJfbD7Tfr4pBEX93RJuVXW7E13C51ZYAhUWbYa".to_string(),
-                password: TEST_PASSWORD.to_string(),
-                name: "test_import_to_pk_which_from_hd".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-                encoding: "".to_string(),
-            };
-
-            let ret = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-            let wallet: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            let derivation = Derivation {
-                chain_type: "BITCOINCASH".to_string(),
-                path: "".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "NONE".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let derive_param = KeystoreCommonDeriveParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-            let ret_bytes = keystore_common_derive(&encode_message(derive_param).unwrap()).unwrap();
-            let ret: AccountsResponse = AccountsResponse::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
-                ret.accounts.first().unwrap().address
-            );
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    pub fn test_keystore_common_verify() {
-        run_test(|| {
-            let wallets = vec![import_default_pk_store(), import_default_wallet()];
-            for wallet in wallets {
-                let param: WalletKeyParam = WalletKeyParam {
-                    id: wallet.id.to_string(),
-                    password: TEST_PASSWORD.to_string(),
-                };
-
-                let ret_bytes = call_api("keystore_common_verify", param).unwrap();
-                let result: Response = Response::decode(ret_bytes.as_slice()).unwrap();
-                assert!(result.is_success);
-
-                let param: WalletKeyParam = WalletKeyParam {
-                    id: wallet.id.to_string(),
-                    password: "WRONG PASSWORD".to_string(),
-                };
-
-                let ret = call_api("keystore_common_verify", param);
-                assert!(ret.is_err());
-                assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
-            }
-        })
-    }
-
-    #[test]
-    pub fn test_keystore_common_delete() {
-        run_test(|| {
-            let param: PrivateKeyStoreImportParam = PrivateKeyStoreImportParam {
-                private_key: "5JZc7wGRUr4J1RHDcM9ySWKLfQ2xjRUEo612qC4RLJ3G7jzJ4qx".to_string(),
-                password: TEST_PASSWORD.to_string(),
-                name: "test_keystore_common_delete".to_string(),
-                password_hint: "".to_string(),
-                overwrite: true,
-                encoding: "".to_string(),
-            };
-
-            let ret_bytes = private_key_store_import(&encode_message(param).unwrap()).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret_bytes.as_slice()).unwrap();
-
-            let param: WalletKeyParam = WalletKeyParam {
-                id: import_result.id.to_string(),
-                password: "WRONG PASSWORD".to_string(),
-            };
-
-            let ret = call_api("keystore_common_delete", param);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
-
-            let param: WalletKeyParam = WalletKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_delete", param).unwrap();
-            let ret: Response = Response::decode(ret_bytes.as_slice()).unwrap();
-            assert!(ret.is_success);
-
-            let param: KeystoreCommonExistsParam = KeystoreCommonExistsParam {
-                r#type: KeyType::PrivateKey as i32,
-                value: "5JZc7wGRUr4J1RHDcM9ySWKLfQ2xjRUEo612qC4RLJ3G7jzJ4qx".to_string(),
-                encoding: "".to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_exists", param).unwrap();
-            let ret: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-
-            assert_eq!(false, ret.is_exists);
-        })
-    }
-
-    #[test]
-    pub fn test_keystore_common_exists() {
-        run_test(|| {
-            let wallet = import_default_wallet();
-            let param: KeystoreCommonExistsParam = KeystoreCommonExistsParam {
-                r#type: KeyType::Mnemonic as i32,
-                value: format!("{}", TEST_MNEMONIC).to_string(),
-                encoding: "".to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_exists", param).unwrap();
-            let result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(result.is_exists);
-            assert_eq!(result.id, wallet.id);
-
-            let wallet = import_default_pk_store();
-            let param: KeystoreCommonExistsParam = KeystoreCommonExistsParam {
-                r#type: KeyType::PrivateKey as i32,
-                value: "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB".to_string(),
-                encoding: "".to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_exists", param).unwrap();
-            let result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(result.is_exists);
-            assert_eq!(result.id, wallet.id);
-
-            let param: KeystoreCommonExistsParam = KeystoreCommonExistsParam {
-                r#type: KeyType::PrivateKey as i32,
-                value: "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6"
-                    .to_string(),
-                encoding: "".to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_exists", param).unwrap();
-            let result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(result.is_exists);
-            assert_eq!(result.id, wallet.id);
-
-            let wallet = import_default_wallet();
-            let param: KeystoreCommonExistsParam = KeystoreCommonExistsParam {
-                r#type: KeyType::Mnemonic as i32,
-                value: format!("{}", " inject  kidney  empty canal shadow  pact comfort  wife crush horse wife sketch  ").to_string(),//Badly formatted mnemonic
-                encoding: "".to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_exists", param).unwrap();
-            let result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(result.is_exists);
-            assert_eq!(result.id, wallet.id);
-
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    pub fn test_keystore_common_accounts() {
-        run_test(|| {
-            let wallet = import_default_wallet();
-
-            let param: KeystoreCommonAccountsParam = KeystoreCommonAccountsParam {
-                id: wallet.id.to_string(),
-            };
-
-            let ret_bytes = call_api("keystore_common_accounts", param).unwrap();
-            let result: AccountsResponse = AccountsResponse::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(0, result.accounts.len());
-
-            let derivations = vec![Derivation {
-                chain_type: "LITECOIN".to_string(),
-                path: "m/44'/2'/0'/0/0".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "NONE".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            }];
-            let param = KeystoreCommonDeriveParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(1, derived_accounts.accounts.len());
-            assert_eq!(
-                "Ldfdegx3hJygDuFDUA7Rkzjjx8gfFhP9DP",
-                derived_accounts.accounts[0].address
-            );
-
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_ckb_tx() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "NERVOS".to_string(),
-                path: "m/44'/309'/0'/0/0".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let wallet = import_and_derive(derivation);
-            let out_points = vec![
-                OutPoint {
-                    tx_hash: "0xfb9c020db967e84af1fbd755df5bc23427e2ed70f73e07895a0c394f6195f083"
-                        .to_owned(),
-                    index: 0,
-                },
-                OutPoint {
-                    tx_hash: "0xfb9c020db967e84af1fbd755df5bc23427e2ed70f73e07895a0c394f6195f083"
-                        .to_owned(),
-                    index: 1,
-                },
-            ];
-
-            let code_hash =
-                "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8".to_owned();
-
-            let input = CkbTxInput {
-                inputs: vec![
-                    CellInput {
-                        previous_output: Some(out_points[0].clone()),
-                        since: "".to_string(),
-                    },
-                    CellInput {
-                        previous_output: Some(out_points[1].clone()),
-                        since: "".to_string(),
-                    },
-                ],
-                witnesses: vec![Witness::default(), Witness::default()],
-                cached_cells: vec![
-                    CachedCell {
-                        capacity: 0,
-                        lock: Some(Script {
-                            hash_type: "type".to_string(),
-                            code_hash: code_hash.clone(),
-                            args: "0xb45772677603bccc71194b2557067fb361c1e093".to_owned(),
-                        }),
-                        out_point: Some(out_points[0].clone()),
-                        derived_path: "0/1".to_string(),
-                    },
-                    CachedCell {
-                        capacity: 0,
-                        lock: Some(Script {
-                            hash_type: "type".to_string(),
-                            code_hash: code_hash.clone(),
-                            args: "0x2d79d9ed37184c1136bcfbe229947a137f80dec0".to_owned(),
-                        }),
-                        out_point: Some(out_points[1].clone()),
-                        derived_path: "1/0".to_string(),
-                    },
-                ],
-                tx_hash: "0x102b8e88daadf1b035577b4d5ea4f604be965df6a918e72daeff6c0c40753401"
-                    .to_owned(),
-            };
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "NERVOS".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(input).unwrap(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let output: CkbTxOutput = CkbTxOutput::decode(ret.as_slice()).unwrap();
-            assert_eq!("0x5500000010000000550000005500000041000000776e010ac7e7166afa50fe54cfecf0a7106a2f11e8110e071ccab67cb30ed5495aa5c5f5ca2967a2fe4a60d5ad8c811382e51d8f916ba2911552bef6dedeca8a00", output.witnesses[0]);
-            assert_eq!("0x5500000010000000550000005500000041000000914591d8abd5233740207337b0588fec58cad63143ddf204970526022b6db26d68311e9af49e1625e3a90e8a66eb1694632558d561d1e5d02cc7c7254e2d546100", output.witnesses[1]);
-
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_tron_tx() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "TRON".to_string(),
-                path: "m/44'/195'/0'/0/0".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let wallet = import_and_derive(derivation);
-
-            let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
-            let input = TronTxInput { raw_data };
-            let input_value = encode_message(input).unwrap();
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password("WRONG PASSWORD".to_string())),
-                chain_type: "TRON".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value.clone(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "TRON1".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value.clone(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "unsupported_chain");
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "TRON".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value,
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
-            let expected_sign = "bbf5ce0549490613a26c3ac4fc8574e748eabda05662b2e49cea818216b9da18691e78cd6379000e9c8a35c13dfbf620f269be90a078b58799b56dc20da3bdf200";
-            assert_eq!(expected_sign, output.signatures[0]);
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    // #[test]
-    // pub fn test_sign_substrate_tx() {
-    //     run_test(|| {
-    //         let derivation = Derivation {
-    //             chain_type: "KUSAMA".to_string(),
-    //             path: "//kusama//imToken/0".to_string(),
-    //             network: "".to_string(),
-    //             seg_wit: "".to_string(),
-    //             chain_id: "".to_string(),
-    //         };
-    //
-    //         let wallet = import_and_derive(derivation);
-    //
-    //         let input = SubstrateTxIn {
-    //             method: "transfer".to_string(),
-    //             address: "EwDXBhgNrcNvMVhm9fRq5YCTdAsPRBPo3t4tUZ85Q9ydKNs".to_string(),
-    //             amount: 10000000000,
-    //             era: Some(ExtrinsicEra {
-    //                 current: 1202925,
-    //                 period: 2400,
-    //             }),
-    //             nonce: 5,
-    //             tip: 10000000000,
-    //             sepc_version: 1045,
-    //             genesis_hash: "b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe"
-    //                 .to_string(),
-    //             block_hash: "790628ced8e0649883f3dd20344d9e6b014f076e788742f0925cf3875997e883"
-    //                 .to_string(),
-    //         };
-    //
-    //         let input_value = encode_message(input).unwrap();
-    //         let tx = SignParam {
-    //             id: wallet.id.to_string(),
-    //             password: TEST_PASSWORD.to_string(),
-    //             chain_type: "KUSAMA".to_string(),
-    //             address: wallet.accounts.first().unwrap().address.to_string(),
-    //             input: Some(::prost_types::Any {
-    //                 type_url: "imtoken".to_string(),
-    //                 value: input_value.clone(),
-    //             }),
-    //         };
-    //
-    //         let ret = call_api("sign_tx", tx).unwrap();
-    //         let output: SubstrateTxOut = SubstrateTxOut::decode(&ret).unwrap();
-    //
-    //         let expected_ret_before_sig =
-    //             "550284ffce9e36de55716d91b1c50caa36a58cee6d28e532a710df0cf90609363947dd7801";
-    //         let expected_ret_after_sig = "dbae140700e40b54020400ff68686f29461fcc99ab3538c391e42556e49efc1ffa7933da42335aa626fae25a0700e40b5402";
-    //
-    //         assert_eq!(
-    //             output.signature[0..74].to_string(),
-    //             expected_ret_before_sig,
-    //             "before sig"
-    //         );
-    //         assert_eq!(
-    //             output.signature[202..].to_string(),
-    //             expected_ret_after_sig,
-    //             "after sig"
-    //         );
-    //
-    //         let sig_bytes = hex::decode(output.signature[74..202].to_string()).unwrap();
-    //         let signature = sp_core::sr25519::Signature::from_slice(&sig_bytes);
-    //
-    //         let pub_key =
-    //             hex::decode("ce9e36de55716d91b1c50caa36a58cee6d28e532a710df0cf90609363947dd78")
-    //                 .unwrap();
-    //         let singer = sp_core::sr25519::Public::from_slice(&pub_key);
-    //         let msg = hex::decode("0400ff68686f29461fcc99ab3538c391e42556e49efc1ffa7933da42335aa626fae25a0700e40b5402dbae140700e40b540215040000b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe790628ced8e0649883f3dd20344d9e6b014f076e788742f0925cf3875997e883").unwrap();
-    //
-    //         assert!(
-    //             sp_core::sr25519::Signature::verify(&signature, msg.as_slice(), &singer),
-    //             "assert sig"
-    //         );
-    //
-    //         remove_created_wallet(&wallet.id);
-    //     })
-    // }
-
-    #[test]
-    pub fn test_import_substrate_keystore() {
-        run_test(|| {
-            let wrong_keystore_str: &str = r#"{
-  "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
-  "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
-  "encoding": {
-    "content": [
-      "pkcs8",
-      "sr25519"
-    ],
-    "type": "",
-    "version": "2"
-  },
-  "meta": {
-    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
-    "name": "i_can_save_name",
-    "tags": [],
-    "whenCreated": 1593591324334
-  }
-}"#;
-
-            let param = SubstrateKeystoreParam {
-                keystore: wrong_keystore_str.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "KUSAMA".to_string(),
-                overwrite: true,
-            };
-            // let param_bytes = encode_message(param).unwrap();
-
-            let ret = call_api("substrate_keystore_exists", param.clone());
-
-            // let ret: Response = Response::decode(ret_bytes.as_slice()).unwrap();
-
-            assert!(ret.is_err());
-            assert_eq!(
-                format!("{}", ret.err().unwrap()),
-                "invalid_keystore# only support xsalsa20-poly1305"
-            );
-
-            let keystore_str: &str = r#"{
-  "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
-  "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
-  "encoding": {
-    "content": [
-      "pkcs8",
-      "sr25519"
-    ],
-    "type": "xsalsa20-poly1305",
-    "version": "2"
-  },
-  "meta": {
-    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
-    "name": "i_can_save_name",
-    "tags": [],
-    "whenCreated": 1593591324334
-  }
-}"#;
-
-            let param = SubstrateKeystoreParam {
-                keystore: keystore_str.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "KUSAMA".to_string(),
-                overwrite: true,
-            };
-            // let param_bytes = encode_message(param).unwrap();
-
-            let ret_bytes = call_api("substrate_keystore_exists", param.clone()).unwrap();
-
-            let exists_result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(!exists_result.is_exists);
-
-            let ret_bytes = call_api("substrate_keystore_import", param.clone()).unwrap();
-            let wallet_ret: WalletResult = WalletResult::decode(ret_bytes.as_slice()).unwrap();
-
-            let ret_bytes = call_api("substrate_keystore_exists", param.clone()).unwrap();
-            let exists_result: KeystoreCommonExistsResult =
-                KeystoreCommonExistsResult::decode(ret_bytes.as_slice()).unwrap();
-            assert!(exists_result.is_exists);
-
-            let derivation = Derivation {
-                chain_type: "KUSAMA".to_string(),
-                path: "".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let param = KeystoreCommonDeriveParam {
-                id: wallet_ret.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let accounts: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(
-                accounts.accounts[0].address,
-                "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
-            );
-
-            let export_param = ExportPrivateKeyParam {
-                id: wallet_ret.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "KUSAMA".to_string(),
-                network: "".to_string(),
-                main_address: "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS".to_string(),
-                path: "".to_string(),
-            };
-            let ret = call_api("substrate_keystore_export", export_param).unwrap();
-            let keystore_ret: ExportSubstrateKeystoreResult =
-                ExportSubstrateKeystoreResult::decode(ret.as_slice()).unwrap();
-
-            let keystore: SubstrateKeystore = serde_json::from_str(&keystore_ret.keystore).unwrap();
-            assert!(keystore.validate().is_ok());
-            assert_eq!(
-                keystore.address,
-                "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
-            );
-            assert_eq!(keystore.meta.name, "i_can_save_name");
-            assert!(keystore.meta.when_created > 1594102917);
-
-            // assert_eq!(keystore_ret.keystore, "");
-            remove_created_wallet(&wallet_ret.id);
-        })
-    }
-
-    #[test]
-    pub fn test_export_hd_polkadot_keystore() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "KUSAMA".to_string(),
-                path: "".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let wallet = import_and_derive(derivation);
-            assert_eq!(
-                wallet.accounts[0].address,
-                "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
-            );
-
-            let export_param = ExportPrivateKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "KUSAMA".to_string(),
-                network: "".to_string(),
-                main_address: "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS".to_string(),
-                path: "".to_string(),
-            };
-            let ret = call_api("substrate_keystore_export", export_param);
-            assert!(ret.is_err());
-            assert_eq!(
-                format!("{}", ret.err().unwrap()),
-                "hd_wallet_cannot_export_keystore"
-            );
-
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    pub fn test_import_multi_curve() {
-        run_test(|| {
-            let keystore_str: &str = r#"{
-  "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
-  "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
-  "encoding": {
-    "content": [
-      "pkcs8",
-      "sr25519"
-    ],
-    "type": "xsalsa20-poly1305",
-    "version": "2"
-  },
-  "meta": {
-    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
-    "name": "keystore_import",
-    "tags": [],
-    "whenCreated": 1593591324334
-  }
-}"#;
-
-            let param = SubstrateKeystoreParam {
-                keystore: keystore_str.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                chain_type: "KUSAMA".to_string(),
-                overwrite: true,
-            };
-            // let param_bytes = encode_message(param).unwrap();
-            let ret_bytes = call_api("substrate_keystore_import", param).unwrap();
-            let wallet_ret: WalletResult = WalletResult::decode(ret_bytes.as_slice()).unwrap();
-            let derivation = Derivation {
-                chain_type: "KUSAMA".to_string(),
-                path: "".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let param = KeystoreCommonDeriveParam {
-                id: wallet_ret.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let accounts: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(
-                accounts.accounts[0].address,
-                "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
-            );
-
-            let derivation = Derivation {
-                chain_type: "LITECOIN".to_string(),
-                path: "".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "NONE".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let param = KeystoreCommonDeriveParam {
-                id: wallet_ret.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param);
-            assert!(ret.is_err());
-            assert_eq!(
-                format!("{}", ret.err().unwrap()),
-                "pkstore_can_not_add_other_curve_account"
-            );
-
-            remove_created_wallet(&wallet_ret.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_substrate_raw_tx() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "KUSAMA".to_string(),
-                path: "//kusama//imToken/0".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let wallet = import_and_derive(derivation);
-
-            let unsigned_msg = "0x0600ffd7568e5f0a7eda67a82691ff379ac4bba4f9c9b859fe779b5d46363b61ad2db9e56c0703d148e25901007b000000dcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025bde8f69eeb5e065e18c6950ff708d7e551f68dc9bf59a07c52367c0280f805ec7";
-            let input = SubstrateRawTxIn {
-                raw_data: unsigned_msg.to_string(),
-            };
-
-            let input_value = encode_message(input).unwrap();
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "KUSAMA".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value.clone(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let output: SubstrateTxOut = SubstrateTxOut::decode(ret.as_slice()).unwrap();
-
-            assert_eq!(output.signature[0..4].to_string(), "0x01",);
-
-            let sig_bytes = hex::decode(output.signature[4..].to_string()).unwrap();
-            let signature = sp_core::sr25519::Signature::from_slice(&sig_bytes).unwrap();
-
-            let pub_key =
-                hex::decode("90742a577c8515391a46b7881c98c80ec92fe04255bb5b5fec862c7d633ada21")
-                    .unwrap();
-            let singer = sp_core::sr25519::Public::from_slice(&pub_key).unwrap();
-            let msg = hex::decode("0600ffd7568e5f0a7eda67a82691ff379ac4bba4f9c9b859fe779b5d46363b61ad2db9e56c0703d148e25901007b000000dcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025bde8f69eeb5e065e18c6950ff708d7e551f68dc9bf59a07c52367c0280f805ec7").unwrap();
-
-            assert!(
-                sp_core::sr25519::Signature::verify(&signature, msg.as_slice(), &singer),
-                "assert sig"
-            );
-
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_tron_tx_by_pk() {
-        run_test(|| {
-            let import_result = import_default_pk_store();
-
-            let derivation = Derivation {
-                chain_type: "TRON".to_string(),
-                path: "".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let rsp: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-            let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
-            let input = TronTxInput { raw_data };
-            let tx = SignParam {
-                id: import_result.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "TRON".to_string(),
-                address: rsp.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(input).unwrap(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
-            let expected_sign = "7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001";
-            assert_eq!(expected_sign, output.signatures[0]);
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_filecoin_bls() {
-        run_test(|| {
-            let import_result = import_filecoin_pk_store();
-
-            let derivation = Derivation {
-                chain_type: "FILECOIN".to_string(),
-                path: "".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "BLS".to_string(),
-            };
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let rsp: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-            let message = UnsignedMessage {
-                to: "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey".to_string(),
-                from: "t3r52r4c7dxhzuhubdenjuxgfak5tbmb3pbcv35wngm6qgvo7bwmvbuuw274rwyhcp53ydtt3ugexjnltnk75q".to_string(),
-                nonce: 0,
-                value: "100000".to_string(),
-                gas_limit: 10000,
-                gas_fee_cap: "20000".to_string(),
-                gas_premium: "20000".to_string(),
-                method: 0,
-                params: "".to_string()
-            };
-
-            let tx = SignParam {
-                id: import_result.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "FILECOIN".to_string(),
-                address: rsp.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(message).unwrap(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let signed = SignedMessage::decode(ret.as_slice()).unwrap();
-            let expected_sign = "r+CN2nhRN7d23jTFDvescYjkqg6iFwlcb2yZugewBsLko96E+UEYuSuhheaSGu1SDU7gYx54tsxYC/Zq3Pk0gfTAHPC2Ui9P5oNE3hNtb0mHO7D4ZHID2I4RxKFTAY8N" ;
-            assert_eq!(expected_sign, signed.signature.unwrap().data);
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_filecoin_secp256k1() {
-        run_test(|| {
-            let import_result = import_default_pk_store();
-
-            let derivation = Derivation {
-                chain_type: "FILECOIN".to_string(),
-                path: "".to_string(),
-                network: "TESTNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "SECP256k1".to_string(),
-            };
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let rsp: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-            let message = UnsignedMessage {
-                to: "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey".to_string(),
-                from: "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i".to_string(),
-                nonce: 0,
-                value: "100000".to_string(),
-                gas_limit: 10000,
-                gas_fee_cap: "20000".to_string(),
-                gas_premium: "20000".to_string(),
-                method: 0,
-                params: "".to_string(),
-            };
-
-            let tx = SignParam {
-                id: import_result.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "FILECOIN".to_string(),
-                address: rsp.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(message).unwrap(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let signed = SignedMessage::decode(ret.as_slice()).unwrap();
-            let expected_sign = "YJLfRrV7WovsWUY4nhKRp8Vs9AGC9J61zV8InwWM6IwxBVhtc20mJC7cxWdVMBQ45Mem2yS7bqQe7alkSxQvpwA=" ;
-            assert_eq!(expected_sign, signed.signature.unwrap().data);
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_by_dk_in_pk_store() {
-        run_test(|| {
-            let import_result = import_default_pk_store();
-
-            let derivation = Derivation {
-                chain_type: "TRON".to_string(),
-                path: "".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations: vec![derivation],
-            };
-
-            let ret = call_api("keystore_common_derive", param).unwrap();
-            let rsp: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-            let param = WalletKeyParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-            let ret_bytes = get_derived_key(&encode_message(param).unwrap()).unwrap();
-            let ret: DerivedKeyResult = DerivedKeyResult::decode(ret_bytes.as_slice()).unwrap();
-            let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
-            let input = TronTxInput { raw_data };
-            let tx = SignParam {
-                id: import_result.id.to_string(),
-                key: Some(Key::DerivedKey(ret.derived_key)),
-                chain_type: "TRON".to_string(),
-                address: rsp.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(input.clone()).unwrap(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
-            let expected_sign = "7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001";
-            assert_eq!(expected_sign, output.signatures[0]);
-
-            let tx = SignParam {
-                id: import_result.id.to_string(),
-                key: Some(Key::DerivedKey("7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001".to_string())),
-                chain_type: "TRON".to_string(),
-                address: rsp.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(input.clone()).unwrap(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx);
-            assert!(ret.is_err());
-            assert_eq!("derived_key_not_matched", format!("{}", ret.err().unwrap()));
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    fn test_sign_message() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "TRON".to_string(),
-                path: "m/44'/195'/0'/0/0".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let wallet = import_and_derive(derivation);
-
-            let input_expects = vec![
-                (TronMessageInput {
-                    value: "645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
-                        .to_string(),
-                    is_hex: true,
-                    is_tron_header: true,
-                }, "16417c6489da3a88ef980bf0a42551b9e76181d03e7334548ab3cb36e7622a484482722882a29e2fe4587b95c739a68624ebf9ada5f013a9340d883f03fcf9af1b"),
-                (TronMessageInput {
-                    value: "0x645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
-                        .to_string(),
-                    is_hex: true,
-                    is_tron_header: true,
-                }, "16417c6489da3a88ef980bf0a42551b9e76181d03e7334548ab3cb36e7622a484482722882a29e2fe4587b95c739a68624ebf9ada5f013a9340d883f03fcf9af1b"),
-                (TronMessageInput {
-                    value: "645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
-                        .to_string(),
-                    is_hex: true,
-                    is_tron_header: false,
-                }, "06ff3c5f98b8e8e257f47a66ce8e953c7a7d0f96eb6687da6a98b66a36c2a725759cab3df94d014bd17760328adf860649303c68c4fa6644d9f307e2f32cc3311c"),
-                (TronMessageInput {
-                    value: "abcdef"
-                        .to_string(),
-                    is_hex: false,
-                    is_tron_header: true,
-                }, "a87eb6ae7e97621b6ba2e2f70db31fe0c744c6adcfdc005044026506b70ac11a33f415f4478b6cf84af32b3b5d70a13a77e53287613449b345bb16fe012c04081b"),
-            ];
-            for (input, expected) in input_expects {
-                let tx = SignParam {
-                    id: wallet.id.to_string(),
-                    key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                    chain_type: "TRON".to_string(),
-                    address: wallet.accounts.first().unwrap().address.to_string(),
-                    input: Some(::prost_types::Any {
-                        type_url: "imtoken".to_string(),
-                        value: encode_message(input).unwrap(),
-                    }),
-                };
-
-                let sign_result = call_api("tron_sign_msg", tx).unwrap();
-                let ret: TronMessageOutput =
-                    TronMessageOutput::decode(sign_result.as_slice()).unwrap();
-                assert_eq!(expected, ret.signature);
-            }
-            //            let input = TronMessageInput {
-            //                value: "645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
-            //                    .to_string(),
-            //                is_hex: true,
-            //                is_tron_header: true,
-            //            };
-        });
-    }
-
-    #[test]
-    fn test_sign_by_dk_hd_store() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "TRON".to_string(),
-                path: "m/44'/195'/0'/0/0".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-            let wallet = import_and_derive(derivation);
-
-            let input = TronMessageInput {
-                value: "645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
-                    .to_string(),
-                is_hex: true,
-                is_tron_header: true,
-            };
-
-            let dk_param = WalletKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-
-            let ret_bytes = get_derived_key(&encode_message(dk_param).unwrap()).unwrap();
-            let ret: DerivedKeyResult = DerivedKeyResult::decode(ret_bytes.as_slice()).unwrap();
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::DerivedKey(ret.derived_key)),
-                chain_type: "TRON".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(input.clone()).unwrap(),
-                }),
-            };
-
-            let sign_result = call_api("tron_sign_msg", tx).unwrap();
-            let ret: TronMessageOutput = TronMessageOutput::decode(sign_result.as_slice()).unwrap();
-            assert_eq!("16417c6489da3a88ef980bf0a42551b9e76181d03e7334548ab3cb36e7622a484482722882a29e2fe4587b95c739a68624ebf9ada5f013a9340d883f03fcf9af1b", ret.signature);
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::DerivedKey("7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001".to_string())),
-                chain_type: "TRON".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: encode_message(input).unwrap(),
-                }),
-            };
-
-            let ret = call_api("tron_sign_msg", tx);
-            assert!(ret.is_err());
-            assert_eq!("derived_key_not_matched", format!("{}", ret.err().unwrap()));
-
-            remove_created_wallet(&wallet.id);
-        });
-    }
-
-    #[test]
-    pub fn test_sign_btc_fork_invalid_address() {
-        run_test(|| {
-            let chain_types = vec!["BITCOINCASH", "LITECOIN"];
-
-            let import_result: WalletResult = import_default_wallet();
-
-            for chain_type in chain_types {
-                let derivation = Derivation {
-                    chain_type: chain_type.to_string(),
-                    path: "m/44'/0'/0'/0/0".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                    chain_id: "".to_string(),
-                    curve: "".to_string(),
-                };
-                let param = KeystoreCommonDeriveParam {
-                    id: import_result.id.to_string(),
-                    password: TEST_PASSWORD.to_string(),
-                    derivations: vec![derivation],
-                };
-
-                let ret = call_api("keystore_common_derive", param).unwrap();
-                let rsp: AccountsResponse = AccountsResponse::decode(ret.as_slice()).unwrap();
-
-                let unspents = vec![Utxo {
-                    tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458"
-                        .to_string(),
-                    vout: 0,
-                    amount: 1000000,
-                    address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
-                    script_pub_key: "76a91488d9931ea73d60eaf7e5671efc0552b912911f2a88ac"
-                        .to_string(),
-                    derived_path: "0/0".to_string(),
-                    sequence: 0,
-                }];
-                let tx_input = BtcForkTxInput {
-                    to: "invalid_address".to_string(),
-                    amount: 500000,
-                    unspents,
-                    fee: 100000,
-                    change_address_index: 1u32,
-                    change_address: "".to_string(),
-                    network: "TESTNET".to_string(),
-                    seg_wit: "NONE".to_string(),
-                };
-                let input_value = encode_message(tx_input).unwrap();
-                let tx = SignParam {
-                    id: import_result.id.to_string(),
-                    key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                    chain_type: chain_type.to_string(),
-                    address: rsp.accounts.first().unwrap().address.to_string(),
-                    input: Some(::prost_types::Any {
-                        type_url: "imtoken".to_string(),
-                        value: input_value.clone(),
-                    }),
-                };
-
-                let ret = call_api("sign_tx", tx);
-                assert!(ret.is_err());
-                assert_eq!(format!("{}", ret.err().unwrap()), "address_invalid");
-            }
-
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_lock_after_sign() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "TRON".to_string(),
-                path: "m/44'/195'/0'/0/0".to_string(),
-                network: "".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let wallet = import_and_derive(derivation);
-
-            let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
-            let input = TronTxInput { raw_data };
-            let input_value = encode_message(input).unwrap();
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "TRON".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value,
-                }),
-            };
-            {
-                let map = KEYSTORE_MAP.read();
-                let keystore: &Keystore = map.get(&wallet.id).unwrap();
-                assert!(keystore.is_locked());
-            }
-
-            let ret = call_api("sign_tx", tx).unwrap();
-            let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
-            let expected_sign = "bbf5ce0549490613a26c3ac4fc8574e748eabda05662b2e49cea818216b9da18691e78cd6379000e9c8a35c13dfbf620f269be90a078b58799b56dc20da3bdf200";
-            assert_eq!(expected_sign, output.signatures[0]);
-
-            {
-                let map = KEYSTORE_MAP.read();
-                let keystore: &Keystore = map.get(&wallet.id).unwrap();
-                assert!(keystore.is_locked());
-            }
-
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    fn test_get_derived_key() {
-        let param = InitTokenCoreXParam {
-            file_dir: "../test-data".to_string(),
-            xpub_common_key: "B888D25EC8C12BD5043777B1AC49F872".to_string(),
-            xpub_common_iv: "9C0C30889CBCC5E01AB5B2BB88715799".to_string(),
-            is_debug: true,
-        };
-
-        handler::init_token_core_x(&encode_message(param).unwrap()).expect("should init tcx");
-
-        let param = WalletKeyParam {
-            id: "cb1ba2d7-7b89-4595-9753-d16b6e317c6b".to_string(),
-            password: "WRONG PASSWORD".to_string(),
-        };
-
-        let ret = call_api("get_derived_key", param);
-        assert!(ret.is_err());
-        assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
-
-        let param = WalletKeyParam {
-            id: "cb1ba2d7-7b89-4595-9753-d16b6e317c6b".to_string(),
-            password: TEST_PASSWORD.to_string(),
-        };
-
-        let ret = call_api("get_derived_key", param).unwrap();
-        let dk_ret: DerivedKeyResult = DerivedKeyResult::decode(ret.as_slice()).unwrap();
-        assert_eq!(dk_ret.derived_key, "119a38ab626aaf8806e223833b29da7aa1d0623e282164d1dd73b0b5e0a88fb4b88937efadd9ca9d4ee931d7b2b33594d75ac4f4d651602819998237b27860fa");
-    }
-    //
-    //    #[test]
-    //    fn test_export_used_dk() {
-    //        let param = InitTokenCoreXParam {
-    //            file_dir: "../test-data".to_string(),
-    //            xpub_common_key: "B888D25EC8C12BD5043777B1AC49F872".to_string(),
-    //            xpub_common_iv: "9C0C30889CBCC5E01AB5B2BB88715799".to_string(),
-    //            is_debug: true,
-    //        };
-    //
-    //        handler::init_token_core_x(&encode_message(param).unwrap()).expect("should init tcx");
-    //
-    //        let param = PrivateKeyStoreExportParam {
-    //            id: "cb1ba2d7-7b89-4595-9753-d16b6e317c6b".to_string(),
-    //            password: "119a38ab626aaf8806e223833b29da7aa1d0623e282164d1dd73b0b5e0a88fb4b88937efadd9ca9d4ee931d7b2b33594d75ac4f4d651602819998237b27860fa".to_string(),
-    //            chain_type: "TRON".to_string(),
-    //            network: "".to_string()
-    //        };
-    //
-    //        let ret = call_api("private_key_store_export", param).unwrap();
-    //        let export_ret: KeystoreCommonExportResult =
-    //            KeystoreCommonExportResult::decode(ret.as_slice()).unwrap();
-    //        assert_eq!(
-    //            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
-    //            export_ret.value
-    //        );
-    //    }
-
-    // #[test]
-    // fn decode_error() {
-    //     let param_hex = "0a166b657973746f72655f636f6d6d6f6e5f646572697665127a0a1d6170692e4b657973746f7265436f6d6d6f6e446572697665506172616d12590a2432303766353663652d306363302d343239352d626165632d353931366434653639353933120831323334313233341a270a0554455a4f5312116d2f3434272f31373239272f30272f30271a074d41494e4e455422002a00";
-    //     let param_bytes = hex::decode(param_hex).unwrap();
-    //     let action: TcxAction = TcxAction::decode(param_bytes.as_slice()).unwrap();
-    //     let param: KeystoreCommonDeriveParam =
-    //         KeystoreCommonDeriveParam::decode(action.param.unwrap().value.as_slice()).unwrap();
-    //     assert_eq!("1", format!("{:?}", param))
-    // }
-
-    #[test]
-    fn test_panic_keystore_locked() {
-        run_test(|| {
-            let wallet = import_default_wallet();
-            let param = WalletKeyParam {
-                id: wallet.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-            };
-            let _ret = call_api("unlock_then_crash", param);
-            let err = unsafe { _to_str(get_last_err_message()) };
-            let err_bytes = hex::decode(err).unwrap();
-            let rsp: Response = Response::decode(err_bytes.as_slice()).unwrap();
-            assert!(!rsp.is_success);
-            assert_eq!(rsp.error, "test_unlock_then_crash");
-            let map = KEYSTORE_MAP.read();
-            let keystore: &Keystore = map.get(&wallet.id).unwrap();
-            assert!(keystore.is_locked())
-        });
-    }
-
-    fn remove_created_wallet(wid: &str) {
-        let full_file_path = format!("{}/{}.json", "/tmp/imtoken/wallets", wid);
-        let p = Path::new(&full_file_path);
-        remove_file(p).expect("should remove file");
-    }
-
-    #[test]
-    pub fn test_sign_tezos_tx() {
-        run_test(|| {
-            let derivation = Derivation {
-                chain_type: "TEZOS".to_string(),
-                path: "m/44'/1729'/0'/0'".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "".to_string(),
-            };
-
-            let wallet = import_and_derive(derivation);
-
-            let raw_data = "d3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700".to_string();
-            let input = TezosRawTxIn { raw_data };
-            let input_value = encode_message(input).unwrap();
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password("WRONG PASSWORD".to_string())),
-                chain_type: "TEZOS".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value.clone(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "TEZOS1".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value.clone(),
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx);
-            assert!(ret.is_err());
-            assert_eq!(format!("{}", ret.err().unwrap()), "unsupported_chain");
-
-            let tx = SignParam {
-                id: wallet.id.to_string(),
-                key: Some(Key::Password(TEST_PASSWORD.to_string())),
-                chain_type: "TEZOS".to_string(),
-                address: wallet.accounts.first().unwrap().address.to_string(),
-                input: Some(::prost_types::Any {
-                    type_url: "imtoken".to_string(),
-                    value: input_value,
-                }),
-            };
-
-            let ret = call_api("sign_tx", tx).unwrap();
-
-            let output: TezosTxOut = TezosTxOut::decode(ret.as_slice()).unwrap();
-            let expected_sign = "0df020458bdcfe24546488dd81e1bd7e2cb05379dc7c72ad626646ae22df5d3a652fdc4ffd2383dd5823a98fe158780928da07a3f0a234e23b759ce7b3a39a0c";
-            assert_eq!(expected_sign, output.signature.as_str());
-            remove_created_wallet(&wallet.id);
-        })
-    }
-
-    #[test]
-    fn test_zksync_api() {
-        let input = ZksyncPrivateKeyFromSeedParam{
-            seed: "9883e3c6e2558f8dc7ab8ad227059d5e59bd1933487372d8bb6c0039246760363762f694a5e43309d7b3a60abd4ac73bc493f899448d28ef29a4a2798e4edc4e1b".to_string(),
-        };
-        let ret = call_api("zksync_private_key_from_seed", input).unwrap();
-        let output: ZksyncPrivateKeyFromSeedResult =
-            ZksyncPrivateKeyFromSeedResult::decode(ret.as_slice()).unwrap();
-        assert_eq!(
-            output.priv_key,
-            "052b33b8567fb0482aa42393daf76a8c9dd3da301358989e47ec26f60a68f37c".to_string()
-        );
-
-        let input = ZksyncSignMusigParam{
-            priv_key: "052b33b8567fb0482aa42393daf76a8c9dd3da301358989e47ec26f60a68f37c".to_string(),
-            bytes: "05000525e8da9bf8e3e67882ba59e291b6897e3db114cf6bdeda9bf8e3e67882ba59e291b6897e3db114cf6bde00289502f90005292e0000001a000000000000000000000000ffffffff".to_string()
-        };
-        let ret = call_api("zksync_sign_musig", input).unwrap();
-        let output: ZksyncSignMusigResult = ZksyncSignMusigResult::decode(ret.as_slice()).unwrap();
-        assert_eq!(output.signature, "c5cd3d01ed5ea20dd16732958c4e02d6c1c5f22544f20a459e609cb7bd6b002f1fbd87f2d94398756ffe7f63e462521ee852479163340c0f9ba0d6f0814eef2e50fd50d7e2314fa4be4590069fe73a8f94c93e81aaba6fd89329dda76f074501".to_string());
-
-        let input = ZksyncPrivateKeyToPubkeyHashParam {
-            priv_key: "052b33b8567fb0482aa42393daf76a8c9dd3da301358989e47ec26f60a68f37c"
-                .to_string(),
-        };
-        let ret = call_api("zksync_private_key_to_pubkey_hash", input).unwrap();
-        let output: ZksyncPrivateKeyToPubkeyHashResult =
-            ZksyncPrivateKeyToPubkeyHashResult::decode(ret.as_slice()).unwrap();
-        assert_eq!(
-            output.pub_key_hash,
-            "90bfd58db4742ce7803ed158f30266ac17b8a0b4".to_string()
-        );
-    }
-
-    #[test]
-    pub fn test_ethereum2_get_pubkey() {
-        run_test(|| {
-            let param = HdStoreImportParam {
-                mnemonic: OTHER_MNEMONIC.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                source: "MNEMONIC".to_string(),
-                name: "test-wallet".to_string(),
-                password_hint: "imtoken".to_string(),
-                overwrite: true,
-            };
-            let ret = call_api("hd_store_import", param).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            let derivations = vec![Derivation {
-                chain_type: "ETHEREUM2".to_string(),
-                path: "m/12381/3600/0/0/0".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "BLS".to_string(),
-            }];
-
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "941c2ab3d28b0fe37fde727e3178738a475696aed7335c7f4c2d91d06a1540acadb8042f119fb5f8029e7765de21fac2",
-                derived_accounts.accounts[0].address
-            );
-            let param: PublicKeyParam = PublicKeyParam {
-                id: import_result.id.to_string(),
-                chain_type: "ETHEREUM2".to_string(),
-                address: "941c2ab3d28b0fe37fde727e3178738a475696aed7335c7f4c2d91d06a1540acadb8042f119fb5f8029e7765de21fac2".to_string(),
-            };
-            let ret_bytes = call_api("get_public_key", param).unwrap();
-            let public_key_result: PublicKeyResult =
-                PublicKeyResult::decode(ret_bytes.as_slice()).unwrap();
-            assert_eq!(
-                "941c2ab3d28b0fe37fde727e3178738a475696aed7335c7f4c2d91d06a1540acadb8042f119fb5f8029e7765de21fac2",
-                public_key_result.public_key
-            );
-            remove_created_wallet(&import_result.id);
-        })
-    }
-
-    #[test]
-    pub fn test_sign_bls_to_execution_change() {
-        run_test(|| {
-            let param = HdStoreImportParam {
-                mnemonic: "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art".to_string(),
-                password: TEST_PASSWORD.to_string(),
-                source: "MNEMONIC".to_string(),
-                name: "test-wallet".to_string(),
-                password_hint: "imtoken".to_string(),
-                overwrite: true,
-            };
-            let ret = call_api("hd_store_import", param).unwrap();
-            let import_result: WalletResult = WalletResult::decode(ret.as_slice()).unwrap();
-
-            let derivations = vec![Derivation {
-                chain_type: "ETHEREUM2".to_string(),
-                path: "m/12381/3600/0/0".to_string(),
-                network: "MAINNET".to_string(),
-                seg_wit: "".to_string(),
-                chain_id: "".to_string(),
-                curve: "BLS".to_string(),
-            }];
-
-            let param = KeystoreCommonDeriveParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                derivations,
-            };
-            let derived_accounts_bytes = call_api("keystore_common_derive", param).unwrap();
-            let derived_accounts: AccountsResponse =
-                AccountsResponse::decode(derived_accounts_bytes.as_slice()).unwrap();
-            assert_eq!(1, derived_accounts.accounts.len());
-            assert_eq!(
-                "99b1f1d84d76185466d86c34bde1101316afddae76217aa86cd066979b19858c2c9d9e56eebc1e067ac54277a61790db",
-                derived_accounts.accounts[0].address
-            );
-
-            let signBlsToExecutionChangeParam = SignBlsToExecutionChangeParam {
-                id: import_result.id.to_string(),
-                password: TEST_PASSWORD.to_string(),
-                genesis_fork_version: "0x03000000".to_string(),
-                genesis_validators_root:
-                    "0x4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95".to_string(),
-                validator_index: vec![0],
-                from_bls_pub_key: derived_accounts.accounts[0].clone().address,
-                eth1_withdrawal_address: "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15".to_string(),
-            };
-            let ret_bytes = call_api(
-                "sign_bls_to_execution_change",
-                signBlsToExecutionChangeParam,
-            )
-            .unwrap();
-            let signBlsToExecutionChangeResult: SignBlsToExecutionChangeResult =
-                SignBlsToExecutionChangeResult::decode(ret_bytes.as_slice()).unwrap();
-
-            assert_eq!(signBlsToExecutionChangeResult.signeds.get(0).unwrap().signature, "8c8ce9f8aedf380e47548501d348afa28fbfc282f50edf33555a3ed72eb24d710bc527b5108022cffb764b953941ec4014c44106d2708387d26cc84cbc5c546a1e6e56fdc194cf2649719e6ac149596d80c86bf6844b36bd47038ee96dd3962f");
-            remove_created_wallet(&import_result.id);
-        })
-    }
-}
diff --git a/token-core/tcx/src/macros.rs b/token-core/tcx/src/macros.rs
new file mode 100644
index 00000000..3a708776
--- /dev/null
+++ b/token-core/tcx/src/macros.rs
@@ -0,0 +1,224 @@
+use std::str::FromStr;
+use tcx_constants::CoinInfo;
+use tcx_keystore::{
+    Address, Keystore, MessageSigner, PublicKeyEncoder, SignatureParameters, TransactionSigner,
+};
+
+use anyhow::anyhow;
+use tcx_primitive::TypedPublicKey;
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MockTransactionInput {}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MockTransactionOutput {}
+
+impl TransactionSigner<MockTransactionInput, MockTransactionOutput> for Keystore {
+    fn sign_transaction(
+        &mut self,
+        _sign_param: &SignatureParameters,
+        _input: &MockTransactionInput,
+    ) -> std::result::Result<MockTransactionOutput, anyhow::Error> {
+        Err(anyhow!("unsupported_chain"))
+    }
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MockMessageInput {}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MockMessageOutput {}
+
+impl MessageSigner<MockMessageInput, MockMessageOutput> for Keystore {
+    fn sign_message(
+        &mut self,
+        _sign_param: &SignatureParameters,
+        _message: &MockMessageInput,
+    ) -> tcx_keystore::Result<MockMessageOutput> {
+        Err(anyhow!("unsupported_chain"))
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct MockAddress();
+
+impl Address for MockAddress {
+    fn from_public_key(
+        _public_key: &TypedPublicKey,
+        _coin: &CoinInfo,
+    ) -> tcx_keystore::Result<Self> {
+        Err(anyhow!("unsupported_chain"))
+    }
+
+    fn is_valid(_address: &str, _coin: &CoinInfo) -> bool {
+        false
+    }
+}
+
+impl FromStr for MockAddress {
+    type Err = anyhow::Error;
+
+    fn from_str(_s: &str) -> Result<Self, Self::Err> {
+        Err(anyhow!("unsupported_chain"))
+    }
+}
+
+impl ToString for MockAddress {
+    fn to_string(&self) -> String {
+        "".to_string()
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct MockPublicKeyEncoder();
+
+impl PublicKeyEncoder for MockPublicKeyEncoder {
+    fn encode(_public_key: &TypedPublicKey, _coin_info: &CoinInfo) -> tcx_keystore::Result<String> {
+        Err(anyhow!("unsupported_chain"))
+    }
+}
+
+macro_rules! use_chains {
+    ($($chain:path),+ $(,)?) => {
+        use tcx_keystore::PublicKeyEncoder;
+        use crate::macros::{MockTransactionInput, MockTransactionOutput, MockAddress, MockPublicKeyEncoder, MockMessageInput, MockMessageOutput};
+
+        #[allow(dead_code)]
+        fn sign_transaction_internal(params: &SignParam, keystore: &mut Keystore) -> std::result::Result<Vec<u8>, anyhow::Error> {
+            type TransactionInput = MockTransactionInput;
+            type TransactionOutput = MockTransactionOutput;
+
+            let faker_input = std::any::TypeId::of::<MockTransactionInput>();
+
+            $({
+                use $chain::*;
+
+                if CHAINS.contains(&params.chain_type.as_str()) && std::any::TypeId::of::<TransactionInput>() != faker_input {
+                    let input: TransactionInput = TransactionInput::decode(
+                        params
+                            .input
+                            .as_ref()
+                            .expect("tx_input")
+                            .value
+                            .clone()
+                            .as_slice(),
+                    )
+                    .expect("TransactionInput");
+                    let curve = CurveType::from_str(&params.curve);
+                    let sign_params = SignatureParameters {
+                        chain_type: params.chain_type.to_string(),
+                        derivation_path: params.path.to_string(),
+                        network: params.network.to_string(),
+                        seg_wit: params.seg_wit.to_string(),
+                        curve,
+
+                    };
+                    let signed_tx: TransactionOutput = keystore.sign_transaction(&sign_params, &input)?;
+
+                    return encode_message(signed_tx)
+                }
+            })*
+
+            Err(anyhow!("unsupported_chain"))
+        }
+
+        #[allow(dead_code)]
+        fn derive_account_internal(coin_info:&CoinInfo, keystore: &mut Keystore) -> Result<Account> {
+            type Address = MockAddress;
+            let faker_address = std::any::TypeId::of::<MockAddress>();
+
+            $({
+                use $chain::*;
+                if CHAINS.contains(&coin_info.coin.as_str()) && std::any::TypeId::of::<Address>() != faker_address {
+                    return keystore.derive_coin::<Address>(coin_info)
+                }
+            })*
+
+            Err(anyhow!("unsupported_chain"))
+        }
+
+        #[allow(dead_code)]
+        fn derive_sub_account(xpub: &TypedDeterministicPublicKey, coin_info:&CoinInfo) -> Result<Account> {
+            type Address = MockAddress;
+            let faker_address = std::any::TypeId::of::<MockAddress>();
+
+            $({
+                use $chain::*;
+                if CHAINS.contains(&coin_info.coin.as_str()) && std::any::TypeId::of::<Address>() != faker_address {
+                    return Keystore::derive_sub_account::<Address>(xpub, coin_info)
+                }
+            })*
+
+            Err(anyhow!("unsupported_chain"))
+        }
+
+        fn sign_message_internal(params:&SignParam, keystore: &mut Keystore) -> Result<Vec<u8>> {
+            type MessageInput = MockMessageInput;
+            type MessageOutput = MockMessageOutput;
+
+            let faker_input = std::any::TypeId::of::<MockMessageInput>();
+
+            $({
+                use $chain::*;
+                if CHAINS.contains(&params.chain_type.as_str()) && std::any::TypeId::of::<MessageInput>() != faker_input {
+                    let input: MessageInput = MessageInput::decode(
+                        params
+                            .input
+                            .as_ref()
+                            .expect("message_input")
+                            .value
+                            .clone()
+                            .as_slice(),
+                    )
+                    .expect("MessageInput");
+                let curve = CurveType::from_str(&params.curve);
+                let sign_params = SignatureParameters {
+                    chain_type: params.chain_type.to_string(),
+                    derivation_path: params.path.to_string(),
+                    network: params.network.to_string(),
+                    seg_wit: params.seg_wit.to_string(),
+                    curve,
+                };
+                    let signed_message: MessageOutput = keystore.sign_message(&sign_params, &input)?;
+                    return encode_message(signed_message)
+                }
+            })*
+
+            Err(anyhow!("unsupported_chain"))
+        }
+
+        fn encode_public_key_internal(public_key: &TypedPublicKey, coin_info:&CoinInfo,) -> Result<String> {
+            type PubKeyEncoder = MockPublicKeyEncoder;
+            let faker_encoder = std::any::TypeId::of::<MockPublicKeyEncoder>();
+            $({
+                use $chain::*;
+                if CHAINS.contains(&coin_info.coin.as_str()) && std::any::TypeId::of::<PubKeyEncoder>() != faker_encoder {
+                    return PubKeyEncoder::encode(&public_key, coin_info)
+                }
+            })*
+
+            return Ok(public_key.to_bytes().to_0x_hex())
+        }
+    };
+}
+
+pub(crate) use use_chains;
+
+macro_rules! impl_to_key {
+    ($type: ty) => {
+        impl From<$type> for tcx_crypto::Key {
+            fn from(key: $type) -> Self {
+                match key {
+                    <$type>::Password(password) => Self::Password(password),
+                    <$type>::DerivedKey(derived_key) => Self::DerivedKey(derived_key),
+                }
+            }
+        }
+    };
+}
+
+pub(crate) use impl_to_key;
diff --git a/token-core/tcx/src/migration.rs b/token-core/tcx/src/migration.rs
new file mode 100644
index 00000000..70af17bc
--- /dev/null
+++ b/token-core/tcx/src/migration.rs
@@ -0,0 +1,765 @@
+use crate::api::{
+    migrate_keystore_param, AccountResponse, GeneralResult, KeystoreResult, LegacyKeystoreResult,
+    MarkIdentityWalletsParam, MigrateKeystoreParam, MigrateKeystoreResult,
+    ReadKeystoreMnemonicPathResult, ScanLegacyKeystoresResult, WalletId,
+};
+use crate::error_handling::Result;
+use crate::filemanager::{cache_keystore, KEYSTORE_MAP, WALLET_FILE_DIR};
+use crate::filemanager::{flush_keystore, LEGACY_WALLET_FILE_DIR};
+use crate::handler::{encode_message, encrypt_xpub};
+use anyhow::anyhow;
+use ethereum_types::H160;
+use prost::Message;
+use serde::{Deserialize, Serialize};
+use serde_json::{json, Value};
+use std::collections::{HashMap, HashSet};
+use std::fs;
+use std::io::Read;
+use std::path::Path;
+use std::str::FromStr;
+use tcx_common::{FromHex, ToHex};
+use tcx_constants::coin_info::get_xpub_prefix;
+use tcx_eth::address::to_checksum;
+use tcx_keystore::keystore::IdentityNetwork;
+use tcx_keystore::Metadata;
+use tcx_keystore::{Keystore, Source};
+use tcx_migration::keystore_upgrade::{mapping_curve_name, KeystoreUpgrade};
+use tcx_migration::migration::{LegacyKeystore, NumberOrNumberStr};
+use tcx_primitive::{Bip32DeterministicPublicKey, Ss58Codec};
+
+const IDENTITY_WALLET_IDS_FILE: &str = "identity-wallet-ids.json";
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct AllIdentityWallets {
+    pub wallet_ids: Vec<String>,
+    pub source: String,
+}
+
+fn read_migrated_map() -> (String, HashMap<String, Vec<String>>) {
+    let legacy_file_dir = {
+        let dir = LEGACY_WALLET_FILE_DIR.read();
+        dir.to_string()
+    };
+
+    let migrated_file = format!("{}/_migrated.json", legacy_file_dir);
+    let map = if let Ok(json_str) = fs::read_to_string(&migrated_file) {
+        serde_json::from_str::<HashMap<String, Vec<String>>>(&json_str).unwrap_or(HashMap::new())
+    } else {
+        HashMap::new()
+    };
+
+    (migrated_file, map)
+}
+
+fn remove_old_keystore_file(id: &str) {
+    let legacy_file_dir = {
+        let dir = LEGACY_WALLET_FILE_DIR.read();
+        dir.to_string()
+    };
+
+    let mut file_path = format!("{}/{}.json", legacy_file_dir, id);
+    if !Path::new(&file_path).exists() {
+        file_path = format!("{}/{}", legacy_file_dir, id);
+    }
+
+    if Path::new(&file_path).exists() {
+        fs::remove_file(&file_path);
+    }
+}
+
+pub fn remove_old_keystore_by_id(id: &str) -> Option<Vec<String>> {
+    let result = read_migrated_map();
+
+    let migrated_file = result.0;
+    let mut map = result.1;
+    let marked_files = map.get(id).and_then(|x| Some(x.to_vec())).clone();
+    if let Some(files) = map.get(id) {
+        for file_id in files.iter() {
+            remove_old_keystore_file(&file_id);
+        }
+    }
+
+    map.remove(id);
+
+    if !map.is_empty() {
+        let json_str = serde_json::to_string(&map).unwrap();
+        fs::write(&migrated_file, json_str);
+    } else {
+        fs::remove_file(&migrated_file);
+    }
+    marked_files
+}
+
+fn mark_keystore_as_migrated(legacy_file_id: &str, migrated_file_id: &str) {
+    let result = read_migrated_map();
+    let mut map: HashMap<String, Vec<String>> = result.1;
+    let migrated_file = result.0;
+
+    let file_ids = map.entry(migrated_file_id.to_string()).or_insert(vec![]);
+    if file_ids.contains(&legacy_file_id.to_string()) {
+        return;
+    }
+
+    file_ids.push(legacy_file_id.to_string());
+
+    let json_str = serde_json::to_string(&map).unwrap();
+    fs::write(&migrated_file, json_str).expect("write migrated.json");
+}
+
+pub(crate) fn migrate_keystore(data: &[u8]) -> Result<Vec<u8>> {
+    let param: MigrateKeystoreParam =
+        MigrateKeystoreParam::decode(data).expect("param: MigrateKeystoreParam");
+    let legacy_file_dir = {
+        let dir = LEGACY_WALLET_FILE_DIR.read();
+        dir.to_string()
+    };
+    let mut file_path = format!("{}/{}.json", legacy_file_dir, param.id);
+    let path = Path::new(&file_path);
+    if !path.exists() {
+        file_path = format!("{}/{}", legacy_file_dir, param.id);
+    }
+    let json_str = fs::read_to_string(file_path)?;
+    let json = serde_json::from_str::<Value>(&json_str)?;
+
+    let key = match param.key.clone().unwrap() {
+        migrate_keystore_param::Key::Password(password) => tcx_crypto::Key::Password(password),
+        migrate_keystore_param::Key::DerivedKey(derived_key) => {
+            tcx_crypto::Key::DerivedKey(derived_key)
+        }
+    };
+
+    let keystore;
+
+    if let Some(version) = json["version"].as_i64() {
+        let network = IdentityNetwork::from_str(&param.network.to_uppercase())?;
+        match version {
+            11000 | 11001 => {
+                let keystore_upgrade = KeystoreUpgrade::new(json);
+                keystore = keystore_upgrade.upgrade(&key, &network)?;
+            }
+            _ => {
+                let legacy_keystore = LegacyKeystore::from_json_str(&json_str)?;
+                keystore = legacy_keystore.migrate(&key, &network)?;
+            }
+        }
+
+        let id = param.id.clone();
+        let mut is_existed = false;
+        let mut existed_id = "".to_string();
+        let fingerprint = keystore.fingerprint();
+        {
+            let mut keystore_map = KEYSTORE_MAP.write();
+            let existed_ks: Vec<&Keystore> = keystore_map
+                .values()
+                .filter(|ks| ks.fingerprint() == fingerprint)
+                .collect();
+            if existed_ks.len() > 0 {
+                is_existed = true;
+                existed_id = existed_ks
+                    .iter()
+                    .find(|ks| existed_keystore_file(&ks.id()))
+                    .expect("At least one keystore file should be existed")
+                    .id();
+                // Note: Temporary retention of the old ID,
+                // so that users can continue to use the old ID for subsequent operations.
+                keystore_map.insert(param.id, keystore.clone());
+            }
+        }
+
+        if is_existed {
+            mark_keystore_as_migrated(&id, &existed_id);
+
+            return encode_message(MigrateKeystoreResult {
+                is_existed: true,
+                existed_id,
+                keystore: None,
+            });
+        } else {
+            mark_keystore_as_migrated(&id, &keystore.id());
+
+            let identity = keystore.identity();
+
+            let keystore_result = KeystoreResult {
+                id: keystore.id(),
+                name: keystore.meta().name,
+                source: keystore.meta().source.to_string(),
+                created_at: keystore.meta().timestamp,
+                identifier: identity.identifier.to_string(),
+                ipfs_id: identity.ipfs_id.to_string(),
+                source_fingerprint: keystore.fingerprint().to_string(),
+            };
+
+            let ret = encode_message(MigrateKeystoreResult {
+                is_existed: false,
+                existed_id: "".to_string(),
+                keystore: Some(keystore_result),
+            });
+            flush_keystore(&keystore)?;
+            cache_keystore(keystore);
+            return ret;
+        }
+    } else {
+        Err(anyhow!("unknown_version_when_upgrade_keystore"))
+    }
+}
+
+pub(crate) fn mark_identity_wallets(data: &[u8]) -> Result<Vec<u8>> {
+    let param: MarkIdentityWalletsParam =
+        MarkIdentityWalletsParam::decode(data).expect("param: MarkIdentityWalletsParam");
+    let json = AllIdentityWallets {
+        wallet_ids: param.ids,
+        source: param.source,
+    };
+
+    let legacy_file_dir = {
+        let dir = LEGACY_WALLET_FILE_DIR.read();
+        dir.to_string()
+    };
+
+    let file_path = format!("{}/{}", legacy_file_dir, IDENTITY_WALLET_IDS_FILE);
+    fs::write(file_path, serde_json::to_string(&json)?)?;
+    let ret = GeneralResult {
+        is_success: true,
+        error: "".to_string(),
+    };
+    return encode_message(ret);
+}
+
+pub(crate) fn read_legacy_keystore_mnemonic_path(data: &[u8]) -> Result<Vec<u8>> {
+    let param: WalletId = WalletId::decode(data).expect("param: WalletId");
+
+    let legacy_file_dir = {
+        let dir = LEGACY_WALLET_FILE_DIR.read();
+        dir.to_string()
+    };
+
+    let mut file_path = format!("{}/{}", legacy_file_dir, param.id);
+    if !Path::new(&file_path).exists() {
+        file_path = format!("{}/{}.json", legacy_file_dir, param.id);
+    }
+    let path = Path::new(&file_path);
+    if path.exists() {
+        let json_str = fs::read_to_string(path)?;
+        let json: Value = serde_json::from_str(&json_str)?;
+
+        if let Some(path) = json["mnemonicPath"].as_str() {
+            return encode_message(ReadKeystoreMnemonicPathResult {
+                path: path.to_string(),
+            });
+        }
+    }
+
+    return encode_message(ReadKeystoreMnemonicPathResult {
+        path: "".to_string(),
+    });
+}
+
+pub fn read_all_identity_wallet_ids() -> Option<AllIdentityWallets> {
+    let file_path_str = format!(
+        "{}/{}",
+        LEGACY_WALLET_FILE_DIR.read(),
+        IDENTITY_WALLET_IDS_FILE
+    );
+    let file_path = Path::new(&file_path_str);
+    if Path::exists(&file_path) {
+        let json_str = fs::read_to_string(file_path).expect("read identity-wallet-ids");
+        let all_identity_wallets =
+            serde_json::from_str::<AllIdentityWallets>(&json_str).expect("AllIdentityWallets");
+        return Some(all_identity_wallets);
+    } else {
+        None
+    }
+}
+
+pub fn remove_all_identity_wallets() -> Option<Vec<String>> {
+    if let Some(all_identity_wallets) = read_all_identity_wallet_ids() {
+        for id in &all_identity_wallets.wallet_ids {
+            remove_old_keystore_file(&id);
+        }
+        let legacy_file_dir = {
+            let dir = LEGACY_WALLET_FILE_DIR.read();
+            dir.to_string()
+        };
+
+        let file_path = format!("{}/identity.json", legacy_file_dir);
+        let _ = fs::remove_file(file_path);
+        let file_path = format!("{}/{}", legacy_file_dir, IDENTITY_WALLET_IDS_FILE);
+        let _ = fs::remove_file(file_path);
+
+        Some(all_identity_wallets.wallet_ids)
+    } else {
+        None
+    }
+}
+
+pub fn existed_keystore_file(id: &str) -> bool {
+    let file_path = format!("{}/{}.json", WALLET_FILE_DIR.read(), id);
+    let path = Path::new(&file_path);
+    path.exists()
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LegacyAccount {
+    pub address: String,
+    pub derivation_path: String,
+    pub curve: String,
+    pub coin: String,
+    pub network: String,
+    pub seg_wit: String,
+    pub ext_pub_key: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub public_key: Option<String>,
+}
+
+pub(crate) fn scan_legacy_keystores() -> Result<ScanLegacyKeystoresResult> {
+    let file_dir = LEGACY_WALLET_FILE_DIR.read();
+    let p = Path::new(file_dir.as_str());
+    let walk_dir = std::fs::read_dir(p).expect("read dir");
+
+    let mut keystores: Vec<LegacyKeystoreResult> = Vec::new();
+    let mut result = ScanLegacyKeystoresResult::default();
+
+    for entry in walk_dir {
+        let entry = entry.expect("DirEntry");
+        let fp = entry.path();
+
+        let mut f = fs::File::open(fp).expect("open file");
+
+        let mut contents = String::new();
+        let read_ret = f.read_to_string(&mut contents);
+        if read_ret.is_err() {
+            // imkey directory
+            continue;
+        }
+
+        let v_result = serde_json::from_str::<Value>(&contents);
+        let Ok(v) = v_result  else {
+            continue;
+        };
+
+        let Some(version) = v["version"].as_i64() else {
+            continue;
+        };
+
+        if version == 11000 || version == 11001 {
+            // let keystore = Keystore::from_json(&contents)?;
+            let mut keystore_result = parse_tcx_keystore(&v)?;
+            dbg!(&keystore_result);
+            keystore_result.source =
+                merge_migrate_source(&keystore_result.id, &keystore_result.source);
+            keystores.push(keystore_result);
+        } else if version == 44 || version == 3 || version == 10001 {
+            let keystore_result = parse_legacy_kesytore(contents)?;
+            keystores.push(keystore_result);
+        } else if version == 10000 {
+            parse_identity_keystore(&mut result, v);
+        }
+    }
+    result.keystores = keystores;
+    Ok(result)
+}
+
+fn parse_identity_keystore(result: &mut ScanLegacyKeystoresResult, v: Value) {
+    result.identifier = v["identifier"].as_str().unwrap_or("").to_string();
+
+    result.ipfs_id = v["ipfsId"].as_str().unwrap_or("").to_string();
+    result.network = v["imTokenMeta"]["network"]
+        .as_str()
+        .expect("identity.json network")
+        .to_string();
+    result.source = v["imTokenMeta"]["source"]
+        .as_str()
+        .expect("identity.json source")
+        .to_string();
+}
+
+fn parse_legacy_kesytore(contents: String) -> Result<LegacyKeystoreResult> {
+    let legacy_keystore = LegacyKeystore::from_json_str(&contents)?;
+    let meta = legacy_keystore
+        .im_token_meta
+        .expect("imToken keystore need meta");
+    let chain_type = if let Some(chain_type) = meta.chain_type {
+        chain_type
+    } else {
+        meta.chain.unwrap()
+    };
+    let seg_wit = if let Some(seg_wit) = meta.seg_wit {
+        seg_wit
+    } else {
+        "NONE".to_string()
+    };
+    let path = if let Some(path) = legacy_keystore.mnemonic_path {
+        if !path.is_empty() && chain_type.eq("BITCOIN") {
+            format!("{}/0/0", path)
+        } else {
+            path
+        }
+    } else {
+        "".to_string()
+    };
+    let (extended_public_key, encrypted_extended_public_key) =
+        if let Some(xpub) = legacy_keystore.xpub {
+            if let Ok(ext_pub_key) = Bip32DeterministicPublicKey::from_ss58check(&xpub) {
+                let ext_pub_key_hex = ext_pub_key.to_hex();
+                let enc_ext_pub_key = encrypt_xpub(&ext_pub_key_hex).unwrap_or("".to_string());
+                (xpub, enc_ext_pub_key)
+            } else {
+                ("".to_string(), "".to_string())
+            }
+        } else {
+            ("".to_string(), "".to_string())
+        };
+    let public_key = if let Some(key_paths) = legacy_keystore.key_path_privates {
+        key_paths
+            .iter()
+            .find(|x| x.derived_mode == Some("PATH_DIRECTLY".to_string()))
+            .map(|x| x.public_key.clone())
+            .unwrap_or_default()
+    } else {
+        "".to_string()
+    };
+
+    let mut address = legacy_keystore.address.unwrap_or("".to_string());
+    if chain_type.eq("ETHEREUM") && !address.eq("") {
+        address = to_checksum(&H160::from_slice(&hex::decode(&address)?), None);
+    }
+
+    let account = AccountResponse {
+        chain_type,
+        address,
+        path,
+        curve: "secp256k1".to_string(),
+        public_key,
+        extended_public_key,
+        encrypted_extended_public_key,
+        seg_wit,
+    };
+    let created_at = match meta.timestamp.clone() {
+        NumberOrNumberStr::Number(t) => t,
+        NumberOrNumberStr::NumberStr(t) => f64::from_str(&t).expect("f64 from timestamp") as i64,
+    };
+    let keystore_result = LegacyKeystoreResult {
+        id: legacy_keystore.id.to_string(),
+        name: meta.name.to_string(),
+        source: meta.source.as_ref().unwrap_or(&"".to_string()).to_string(),
+        created_at: created_at.to_string(),
+        accounts: vec![account],
+    };
+    Ok(keystore_result)
+}
+
+fn parse_tcx_keystore(v: &Value) -> Result<LegacyKeystoreResult> {
+    let legacy_accounts: Vec<LegacyAccount> = serde_json::from_value(v["activeAccounts"].clone())
+        .ok()
+        .unwrap_or(vec![]);
+    let mut account_responses: Vec<AccountResponse> = vec![];
+    for legacy_account in legacy_accounts.iter() {
+        let public_key = if let Some(public_key) = &legacy_account.public_key {
+            public_key.to_string()
+        } else {
+            "".to_string()
+        };
+
+        let (extended_public_key, encrypted_extended_public_key) = if !legacy_account
+            .ext_pub_key
+            .is_empty()
+        {
+            let Ok(hd_key) = Bip32DeterministicPublicKey::from_hex_auto(&legacy_account.ext_pub_key) else {
+                    continue;
+                };
+            let xpub_prefix = get_xpub_prefix(&legacy_account.network);
+            let extended_public_key = hd_key.to_ss58check_with_version(&xpub_prefix);
+
+            (
+                extended_public_key,
+                encrypt_xpub(&legacy_account.ext_pub_key).unwrap_or("".to_string()),
+            )
+        } else {
+            ("".to_string(), "".to_string())
+        };
+
+        let mut address = legacy_account.address.to_string();
+        if legacy_account.coin.eq("ETHEREUM") {
+            address = to_checksum(&H160::from_slice(&hex::decode(&address)?), None);
+        }
+
+        account_responses.push(AccountResponse {
+            chain_type: legacy_account.coin.to_string(),
+            address,
+            path: legacy_account.derivation_path.to_string(),
+            curve: mapping_curve_name(legacy_account.curve.as_str()).to_string(),
+            public_key,
+            extended_public_key,
+            encrypted_extended_public_key,
+            seg_wit: legacy_account.seg_wit.to_string(),
+        })
+    }
+    let id = v["id"].as_str().expect("keystore id").to_string();
+    let meta: Metadata = serde_json::from_value(v["imTokenMeta"].clone())?;
+    let keystore_result = LegacyKeystoreResult {
+        id,
+        name: meta.name.to_string(),
+        source: meta.source.to_string(),
+        created_at: meta.timestamp.to_string(),
+        accounts: account_responses,
+    };
+    Ok(keystore_result)
+}
+
+fn merge_migrate_source(id: &str, ori_source: &str) -> String {
+    // Note: tcx keystore treat _identity source as mnemonic, below code fix that
+    if let Some(all_identity_wallets) = read_all_identity_wallet_ids() {
+        if all_identity_wallets.wallet_ids.contains(&id.to_string()) {
+            all_identity_wallets.source.to_string()
+        } else {
+            ori_source.to_string()
+        }
+    } else {
+        ori_source.to_string()
+    }
+}
+#[cfg(test)]
+mod tests {
+    use std::fs;
+
+    use crate::{
+        api::MarkIdentityWalletsParam,
+        filemanager::LEGACY_WALLET_FILE_DIR,
+        handler::encode_message,
+        migration::{mark_identity_wallets, scan_legacy_keystores},
+    };
+    use serial_test::serial;
+    use tcx_keystore::keystore::IdentityNetwork;
+
+    #[test]
+    #[serial]
+
+    fn test_scan_tcx_legacy_keystores_return_right_source() {
+        *LEGACY_WALLET_FILE_DIR.write() = "../test-data/wallets-ios-2_14_1/".to_string();
+        let param = MarkIdentityWalletsParam {
+            ids: vec!["0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string()],
+            source: "RECOVERED_IDENTITY".to_string(),
+        };
+        mark_identity_wallets(&encode_message(param).unwrap());
+
+        let result = scan_legacy_keystores().unwrap();
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("0a2756cd-ff70-437b-9bdb-ad46b8bb0819"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.source, "RECOVERED_IDENTITY");
+
+        let param = MarkIdentityWalletsParam {
+            ids: vec!["0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string()],
+            source: "NEW_IDENTITY".to_string(),
+        };
+        mark_identity_wallets(&encode_message(param).unwrap());
+
+        let result = scan_legacy_keystores().unwrap();
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("0a2756cd-ff70-437b-9bdb-ad46b8bb0819"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.source, "NEW_IDENTITY");
+        fs::remove_file("../test-data/wallets-ios-2_14_1/identity-wallet-ids.json").unwrap();
+    }
+
+    #[test]
+    #[serial]
+
+    fn test_scan_tcx_legacy_keystores() {
+        *LEGACY_WALLET_FILE_DIR.write() = "../test-data/wallets-ios-2_14_1/".to_string();
+        let param = MarkIdentityWalletsParam {
+            ids: vec!["0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string()],
+            source: "RECOVERED_IDENTITY".to_string(),
+        };
+        let _ = mark_identity_wallets(&encode_message(param).unwrap());
+
+        let result = scan_legacy_keystores().unwrap();
+
+        assert_eq!(result.identifier, "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg");
+
+        assert_eq!(
+            result.ipfs_id,
+            "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU"
+        );
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("0a2756cd-ff70-437b-9bdb-ad46b8bb0819"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(account.address, "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2");
+        assert_eq!(account.chain_type, "TRON");
+        assert_eq!(account.path, "m/44'/195'/0'/0/0");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(
+            account.public_key,
+            "037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5"
+        );
+        assert_eq!(account.extended_public_key, "tpubDCxD6k9PreNhSacpfSZ3iErESZnncY1n7qU7e3stZXLPh84xVVt5ERMAqKeefUU8jswx2GpCkQpeYow4xH3PGx2iim6ftPa32GNvTKAtknz");
+        assert_eq!(account.encrypted_extended_public_key, "b78BOM632Fph4a2xIzWH7Y2fUbHbkYVr2OgJ4WuNxubppAue5npoXgG1kjB7ATxYxpjxYqu/0TgRM1Dz8QO3cT1GPVASzzt4U+f2qeiQcUSj3pnYneGRDcTnY9JsXZmshVbmX7s1He9a0j8x7UeUCS61JM3S9nATdx6YVU/+ViD2tDdRHk6v8IwGnh1uoKb2a/CCsYQbPs5taZoLfwS3BA==");
+        assert_eq!(keystore.source, "RECOVERED_IDENTITY");
+
+        let account = keystore
+            .accounts
+            .iter()
+            .find(|x| x.chain_type.eq("FILECOIN"))
+            .unwrap();
+        assert_eq!(account.address, "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey");
+        assert_eq!(account.chain_type, "FILECOIN");
+        assert_eq!(account.path, "m/44'/461'/0'/0/0");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(
+            account.public_key,
+            "03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785"
+        );
+        assert_eq!(account.extended_public_key, "tpubDDaEZaaDDmwnZTP6u7m3yTKFgnbSx2uTaxp1hKM5oiVZo6iBB46rWnWpdkpbPxtfdYiyLbyhqgbXRXYff3LfW4rCpYyfpb5pC67CPZdKkZB");
+        assert_eq!(account.encrypted_extended_public_key, "PyK/ofjxHbRbZlOE7N4Au7LZIzM5DoV6SgHbfrQvaOsWv5ZwXL2s3nQk6eCj1SIRL6A3s9STpPz7Y3KdggApnOgUpIw7v6ZB3kTKbH4Y8RPH8e1Nlkg2J1CDaf5US1nBmWCxKD4gDh9GEI8H41/MaRWIBnyyw+vwCf5hvVpSvpL9b/sUe8boZmw/VfNpbF5MkGMtFyaZnxd80qFqxgc8fA==");
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("4d5cbfcf-aee1-4908-9991-9d060eb68a0e"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "4d5cbfcf-aee1-4908-9991-9d060eb68a0e");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(account.address, "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz");
+        assert_eq!(account.chain_type, "TEZOS");
+        assert_eq!(account.curve, "ed25519");
+        assert_eq!(
+            account.public_key,
+            "bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"
+        );
+        assert_eq!(account.path, "");
+        assert_eq!(account.extended_public_key, "");
+        assert_eq!(account.encrypted_extended_public_key, "");
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(account.address, "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa");
+        assert_eq!(account.chain_type, "FILECOIN");
+        assert_eq!(account.curve, "bls12-381");
+        assert_eq!(
+            account.public_key,
+            "80f0d9dfb26b6c66254fd6663f4cbe39c4ca46e54f779c2e30c618fb57350e5b7f55b51c16e04c9d2550f3b731551ed7"
+        );
+        assert_eq!(account.path, "");
+        assert_eq!(account.extended_public_key, "");
+        assert_eq!(account.encrypted_extended_public_key, "");
+
+        fs::remove_file("../test-data/wallets-ios-2_14_1/identity-wallet-ids.json").unwrap();
+    }
+
+    #[test]
+    #[serial]
+    fn test_scan_legacy_keystores() {
+        *LEGACY_WALLET_FILE_DIR.write() = "../test-data/wallets-ios-2_14_1/".to_string();
+        let result = scan_legacy_keystores().unwrap();
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("00fc0804-7cea-46d8-9e95-ed1efac65358"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "00fc0804-7cea-46d8-9e95-ed1efac65358");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(account.address, "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB");
+        assert_eq!(account.chain_type, "BITCOIN");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(account.public_key, "");
+        assert_eq!(account.path, "m/49'/1'/0'/0/0");
+        assert_eq!(account.extended_public_key, "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv");
+        assert_eq!(account.encrypted_extended_public_key, "re1xUqBS63Dybo7YZi60QdPm9MC7VdCoHABo7T1qf+btzCUROCND0HxmrShSZEy08QzLoiXxvZBO20/wS7OGjNXmI9wH2i7554S1ol5kwTKoid3Qhk12U6s1zHKCuInAdcNW+/jh4ttp6cO3hosjQGJRCQu8Ts43/TFsN+I0A/8DtyJlSbg1YYz5Xn9R83IRc4R8EvdHj0M2Mrfnae4T0g==");
+        assert_eq!(keystore.source, "RECOVERED_IDENTITY");
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("6c3eae60-ad03-48db-a5e5-61a6f72aef8d"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "6c3eae60-ad03-48db-a5e5-61a6f72aef8d");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(account.address, "");
+        assert_eq!(account.chain_type, "EOS");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(account.path, "m/44'/194'/0'/0/0");
+        assert_eq!(
+            account.public_key,
+            "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF"
+        );
+        assert_eq!(account.extended_public_key, "");
+        assert_eq!(account.encrypted_extended_public_key, "");
+        assert_eq!(keystore.source, "RECOVERED_IDENTITY");
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("9b696367-69c1-4cfe-8325-e5530399fc3f"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "9b696367-69c1-4cfe-8325-e5530399fc3f");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(
+            account.address,
+            "cosmos1m566v5rcklnac8vc0dftfu4lnvznhlu7d3f404"
+        );
+        assert_eq!(account.chain_type, "COSMOS");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(account.path, "m/44'/118'/0'/0/0");
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("60573d8d-8e83-45c3-85a5-34fbb2aad5e1"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "60573d8d-8e83-45c3-85a5-34fbb2aad5e1");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(
+            account.address,
+            "0x02c98F4ED8c8aAb1aABA46539e45070a02e416C0"
+        );
+        assert_eq!(account.chain_type, "ETHEREUM");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(account.path, "");
+        assert_eq!(keystore.source, "KEYSTORE");
+
+        let keystore = result
+            .keystores
+            .iter()
+            .find(|x| x.id.eq("792a0051-16d7-44a7-921a-9b4a0c893b8f"))
+            .clone()
+            .unwrap();
+        assert_eq!(keystore.id, "792a0051-16d7-44a7-921a-9b4a0c893b8f");
+        let account = keystore.accounts.first().unwrap();
+        assert_eq!(
+            account.address,
+            "0x7152bcad819b084d57179e293D2765fFa0109E04"
+        );
+        assert_eq!(account.chain_type, "ETHEREUM");
+        assert_eq!(account.curve, "secp256k1");
+        assert_eq!(account.path, "m/44'/60'/0'/0/1");
+        assert_eq!(keystore.source, "MNEMONIC");
+    }
+}
diff --git a/token-core/tcx/tests/common/mod.rs b/token-core/tcx/tests/common/mod.rs
new file mode 100644
index 00000000..f94a5eeb
--- /dev/null
+++ b/token-core/tcx/tests/common/mod.rs
@@ -0,0 +1,177 @@
+use error_handling::Result;
+
+use std::ffi::{CStr, CString};
+use std::fs::remove_file;
+use std::os::raw::c_char;
+use std::panic;
+use std::path::Path;
+use tcx::api::derive_accounts_param::Derivation;
+
+use tcx::*;
+
+use tcx_common::ToHex;
+
+use prost::Message;
+use tcx::api::{
+    DeriveAccountsParam, DeriveAccountsResult, GeneralResult, ImportMnemonicParam,
+    ImportPrivateKeyParam, ImportPrivateKeyResult, InitTokenCoreXParam, KeystoreResult, TcxAction,
+};
+use tcx::handler::import_mnemonic;
+use tcx::handler::{encode_message, import_private_key};
+
+use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
+
+use std::fs;
+
+use sp_core::ByteArray;
+
+use anyhow::anyhow;
+use tcx_common::hex::FromHex;
+
+pub fn _to_c_char(str: &str) -> *const c_char {
+    CString::new(str).unwrap().into_raw()
+}
+
+pub fn _to_str(json_str: *const c_char) -> &'static str {
+    let json_c_str = unsafe { CStr::from_ptr(json_str) };
+    json_c_str.to_str().unwrap()
+}
+
+pub fn setup() {
+    let p = Path::new("/tmp/imtoken/wallets");
+    if !p.exists() {
+        fs::create_dir_all(p).expect("shoud create filedir");
+    }
+
+    init_token_core_x("/tmp/imtoken");
+}
+
+pub fn teardown() {
+    fs::remove_dir_all("/tmp/imtoken").expect("remove test directory");
+}
+
+pub fn run_test<T>(test: T) -> ()
+where
+    T: FnOnce() -> () + panic::UnwindSafe,
+{
+    setup();
+    let result = panic::catch_unwind(|| test());
+    teardown();
+    assert!(result.is_ok())
+}
+
+pub fn import_default_wallet() -> KeystoreResult {
+    let param = ImportMnemonicParam {
+        mnemonic: TEST_MNEMONIC.to_string(),
+        password: TEST_PASSWORD.to_string(),
+        network: "TESTNET".to_string(),
+        name: "test-wallet".to_string(),
+        password_hint: "imtoken".to_string(),
+        overwrite: true,
+    };
+    let ret = import_mnemonic(&encode_message(param).unwrap()).unwrap();
+    KeystoreResult::decode(ret.as_slice()).unwrap()
+}
+
+pub fn import_default_pk_store() -> ImportPrivateKeyResult {
+    let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+        private_key: "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB".to_string(),
+        password: TEST_PASSWORD.to_string(),
+        name: "import_default_pk_store".to_string(),
+        password_hint: "".to_string(),
+        network: "".to_string(),
+        overwrite: true,
+    };
+
+    let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+    ImportPrivateKeyResult::decode(ret.as_slice()).unwrap()
+}
+
+pub fn import_filecoin_pk_store() -> KeystoreResult {
+    let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+        private_key: "f15716d3b003b304b8055d9cc62e6b9c869d56cc930c3858d4d7c31f5f53f14a".to_string(),
+        password: TEST_PASSWORD.to_string(),
+        name: "import_filecoin_pk_store".to_string(),
+        password_hint: "".to_string(),
+        network: "".to_string(),
+        overwrite: true,
+    };
+
+    let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+    KeystoreResult::decode(ret.as_slice()).unwrap()
+}
+
+pub fn import_and_derive(derivation: Derivation) -> (KeystoreResult, DeriveAccountsResult) {
+    let wallet = import_default_wallet();
+
+    let param = DeriveAccountsParam {
+        id: wallet.id.to_string(),
+        key: Some(tcx::api::derive_accounts_param::Key::Password(
+            TEST_PASSWORD.to_owned(),
+        )),
+        derivations: vec![derivation],
+    };
+
+    let ret = call_api("derive_accounts", param).unwrap();
+    let accounts: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+
+    (wallet, accounts)
+}
+
+pub fn import_pk_and_derive(
+    derivation: Derivation,
+) -> (ImportPrivateKeyResult, DeriveAccountsResult) {
+    let wallet = import_default_pk_store();
+
+    let param = DeriveAccountsParam {
+        id: wallet.id.to_string(),
+        key: Some(tcx::api::derive_accounts_param::Key::Password(
+            TEST_PASSWORD.to_owned(),
+        )),
+        derivations: vec![derivation],
+    };
+
+    let ret = call_api("derive_accounts", param).unwrap();
+    let accounts: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+
+    (wallet, accounts)
+}
+
+pub fn call_api(method: &str, msg: impl Message) -> Result<Vec<u8>> {
+    let param = TcxAction {
+        method: method.to_string(),
+        param: Some(::prost_types::Any {
+            type_url: "imtoken".to_string(),
+            value: encode_message(msg).unwrap(),
+        }),
+    };
+    let _ = unsafe { clear_err() };
+    let param_bytes = encode_message(param).unwrap();
+    let param_hex = param_bytes.to_hex();
+    let ret_hex = unsafe { _to_str(call_tcx_api(_to_c_char(&param_hex))) };
+    let err = unsafe { _to_str(get_last_err_message()) };
+    if !err.is_empty() {
+        let err_bytes = Vec::from_hex(err).unwrap();
+        let err_ret: GeneralResult = GeneralResult::decode(err_bytes.as_slice()).unwrap();
+        Err(anyhow!("{}", err_ret.error))
+    } else {
+        Ok(Vec::from_hex(ret_hex).unwrap())
+    }
+}
+
+pub fn init_token_core_x(file_dir: &str) {
+    let param = InitTokenCoreXParam {
+        file_dir: file_dir.to_string(),
+        xpub_common_key: "B888D25EC8C12BD5043777B1AC49F872".to_string(),
+        xpub_common_iv: "9C0C30889CBCC5E01AB5B2BB88715799".to_string(),
+        is_debug: true,
+    };
+    let response = call_api("init_token_core_x", param);
+    assert!(response.is_ok());
+}
+
+pub fn remove_created_wallet(wid: &str) {
+    let full_file_path = format!("{}/{}.json", "/tmp/imtoken/walletsv2", wid);
+    let p = Path::new(&full_file_path);
+    remove_file(p).expect("should remove file");
+}
diff --git a/token-core/tcx/tests/derive_test.rs b/token-core/tcx/tests/derive_test.rs
new file mode 100644
index 00000000..30e46e43
--- /dev/null
+++ b/token-core/tcx/tests/derive_test.rs
@@ -0,0 +1,823 @@
+use common::run_test;
+use serial_test::serial;
+
+mod common;
+
+use tcx::api::derive_accounts_param::Derivation;
+
+use tcx::*;
+
+use prost::Message;
+use tcx::api::{
+    DeriveAccountsParam, DeriveAccountsResult, DeriveSubAccountsParam, DeriveSubAccountsResult,
+    GetExtendedPublicKeysParam, GetExtendedPublicKeysResult, GetPublicKeysParam,
+    GetPublicKeysResult, ImportMnemonicParam, ImportPrivateKeyParam, ImportPrivateKeyResult,
+    KeystoreResult, MnemonicToPublicKeyParam, MnemonicToPublicKeyResult, PublicKeyDerivation,
+};
+use tcx::handler::encode_message;
+use tcx::handler::import_mnemonic;
+use tcx_constants::TEST_PRIVATE_KEY;
+use tcx_constants::{OTHER_MNEMONIC, TEST_MNEMONIC, TEST_PASSWORD};
+
+use sp_core::ByteArray;
+
+use tcx::handler::*;
+
+use crate::common::*;
+
+#[test]
+#[serial]
+pub fn test_derive_accounts() {
+    run_test(|| {
+        let param = ImportMnemonicParam {
+            mnemonic: OTHER_MNEMONIC.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            network: "TESTNET".to_string(),
+            name: "test-wallet".to_string(),
+            password_hint: "imtoken".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_mnemonic", param).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivations = vec![
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/44'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/49'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/49'/1'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "NERVOS".to_string(),
+                path: "m/44'/309'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "//kusama//imToken/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "//polkadot//imToken/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "m/44'/461'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "m/12381/461/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "bls12-381".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "COSMOS".to_string(),
+                path: "m/44'/118'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "EOS".to_string(),
+                path: "m/44'/194'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "m/44'/60'/0'/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/44'/0'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/49'/0'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/84'/0'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "m/86'/0'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "TEZOS".to_string(),
+                path: "m/44'/1729'/0'/0'".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "ed25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+        ];
+
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(17, derived_accounts.accounts.len());
+        assert_eq!(
+            "LQ3JqCohgLQ3x1CJXYERnJTy1ySaqr1E32",
+            derived_accounts.accounts[0].address
+        );
+        assert_eq!("/EhDRyPFcj1UGx8i+WiJSIeBSyaN0pX7Oq3wXqwO5M9T1aRhfLpsNPGAPLf07K+p+B0OdQW1ogVbDQCWkIwVXZLPY+njp9LjXaICiWGEeidR1TwBZSwOMRKE68wJWH/7puxYfY/Rq1+d2GFv6NxSCw==", derived_accounts.accounts[0].encrypted_extended_public_key);
+        assert_eq!("xpub6BwqzNhMbFpgegP8WGBzFmm7aUsrDQtuuRdT3J3nDhDGnbPCER8qGghKJUCJNhjn2wyZVwAC6mwLNPu9xQpeQenqnzzVj2X7tnDLAM58fRn", derived_accounts.accounts[0].extended_public_key);
+
+        assert_eq!(
+            "MQUu6P7wsLQZfVZMuFWB7UXiheuVTM7RYF",
+            derived_accounts.accounts[1].address
+        );
+        //            assert_eq!("5wlT8R+syH37UjMSJXOW3v96ORRykslaBOX7wa+aEt4jbshR9ljP5u+DDskzV5hAKuSBuIPftafEA/k4YQ4Zh2mByl0EE/5jdZI/ZbE0a2zsIiU9BIGuhzA/f+vvQuDJqOHofDd8z0qDesuqxLKv4A==", derived_accounts.accounts[1].encrypted_extended_public_key);
+        assert_eq!("A5LUzJcPB4r54wqr8EjFh9fe0L87spIN9KJKtzHV6QJXBH6GEAiYT57uftpJITx613HdIXXzi8VJ30TmG8erBF30oD1DnbDmGmDo4sdRTdQSsp9NuprhZ3Y3PR9+xzdc2tKDblRL5dLZswaPxCOQcw==", derived_accounts.accounts[1].encrypted_extended_public_key);
+
+        assert_eq!(
+            "mvdDMnRsqjqzvCyYyRXpvscmnU1FxodhkE",
+            derived_accounts.accounts[2].address
+        );
+        assert_eq!("eZIL4e0a8qw18Pve92iLfehteHDA+kqjwv91aKE+2hNN3arkq20yY2Mx6q4WAowFv0QRfIi6QlrhafJKUpjiC469NNZagCSHLaECYliEwmwTgC97zXmVJDB6MJi79y+mznf8G7Few8+u6UfiXELN5g==", derived_accounts.accounts[2].encrypted_extended_public_key);
+
+        assert_eq!(
+            "TLZnqkrSNLUWNrZMug8u9b6pJ3XcTGbzDV",
+            derived_accounts.accounts[3].address
+        );
+        assert_eq!("Sla41n5BdHqc1QmqA9DXjWNx13Fpq18u19jCaMbYbxClsPr7cr/gzXsbE+08wfNLuGgtVVY4/prpnv3/pdJ8KA/I/iOKvelKxuJgN9n2O5Q54CmObc0qJVZxcAQM0PbrKE9YJyGDkJNMLM+OmjEwjg==", derived_accounts.accounts[3].encrypted_extended_public_key);
+
+        assert_eq!(
+            "ckt1qyqgkffut7e7md39tp5ts9vxssj7wdw8z4cquyflka",
+            derived_accounts.accounts[4].address
+        );
+
+        assert_eq!(
+            "HFEP5ePp69xrCLTYcDnzqJTgmH87RUKprkoRUuEmu9Tk49s",
+            derived_accounts.accounts[5].address
+        );
+        assert_eq!(
+            "13GVaZUS28zTCroTPq8dyppfm8F4cAvoJsSZ3yvmtyRYLSLJ",
+            derived_accounts.accounts[6].address
+        );
+        assert_eq!(
+            "t1k7yhkb42jhgrsx4nhr7rfkxfiahmkyxq5cw74ry",
+            derived_accounts.accounts[7].address
+        );
+        assert_eq!(
+            "t3qnoxt4gpoyahbgmh2n2cvpeqoqa7jowlyxyuo3jgedp4gdyauhvcydd6var2d3i6yyrdhpqsixqxozp7b64a",
+            derived_accounts.accounts[8].address
+        );
+        assert_eq!(
+            "cosmos1m566v5rcklnac8vc0dftfu4lnvznhlu7d3f404",
+            derived_accounts.accounts[9].address
+        );
+
+        assert_eq!("", derived_accounts.accounts[10].address);
+        assert_eq!(
+            "EOS7Nf9TU1vZaQQgZA3cELTHJf1nnDJ6xVvqHvVzbHehsgcjrzNkq",
+            derived_accounts.accounts[10].public_key
+        );
+        assert_eq!(
+            "0x37c6713aa848bCdeE372A620eEbCdcCBA55c695F",
+            derived_accounts.accounts[11].address
+        );
+        assert_eq!(
+            "1PHNSh4M6uLqJfiDWZRj4w2F2LXSaygVtE",
+            derived_accounts.accounts[12].address
+        );
+        assert_eq!(
+            "3CwQ11hx8yT6eGXqQJBFCRxZ8eCnLd9wZj",
+            derived_accounts.accounts[13].address
+        );
+        assert_eq!(
+            "bc1qk5ctv049qsavhh6ykygnm43mjuk5v26jd34qgq",
+            derived_accounts.accounts[14].address
+        );
+        assert_eq!(
+            "bc1phazpdjkaruvcqhaakmk56tvmqcd4kx5svvrjdrck5m7g3q2uadpszxypw0",
+            derived_accounts.accounts[15].address
+        );
+
+        assert_eq!(
+            "tz1YhnU6rUigVp6Jei1VJQHofGSbzGKphVmG",
+            derived_accounts.accounts[16].address
+        );
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_hd_store_derive_invalid_param() {
+    run_test(|| {
+        let import_result: KeystoreResult = import_default_wallet();
+
+        let invalid_derivations = vec![
+            Derivation {
+                chain_type: "WRONG_CHAIN_TYPE".to_string(),
+                path: "m/44'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "WRONG/PATH".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "49'/1'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+        ];
+        for derivation in invalid_derivations {
+            let param = DeriveAccountsParam {
+                id: import_result.id.to_string(),
+                key: Some(crate::api::derive_accounts_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+                derivations: vec![derivation],
+            };
+            let ret = call_api("derive_accounts", param);
+            assert!(ret.is_err());
+        }
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_get_public_keys() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let param: GetPublicKeysParam = GetPublicKeysParam {
+            id: wallet.id.to_string(),
+            key: Some(crate::api::get_public_keys_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![PublicKeyDerivation {
+                chain_type: "EOS".to_string(),
+                path: "m/44'/194'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+            }],
+        };
+        let ret_bytes = call_api("get_public_keys", param).unwrap();
+        let public_key_result: GetPublicKeysResult =
+            GetPublicKeysResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+            public_key_result.public_keys[0]
+        );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_get_public_keys_ethereum2() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let param: GetPublicKeysParam = GetPublicKeysParam {
+            id: wallet.id.to_string(),
+            key: Some(crate::api::get_public_keys_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![PublicKeyDerivation {
+                chain_type: "ETEHREUM2".to_string(),
+                path: "m/12381/3600/0/0".to_string(),
+                curve: "bls12-381".to_string(),
+            }],
+        };
+        let ret_bytes = call_api("get_public_keys", param).unwrap();
+        let public_key_result: GetPublicKeysResult =
+            GetPublicKeysResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+                "0x99833eeee8cfad1bb7a82a5ceecca02590eeb342ad491c64c270fdb9bd739c398b7f8ca8608bfada25ba4efb5d8e5653",
+                public_key_result.public_keys[0]
+            );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_get_pubkey_keys() {
+    run_test(|| {
+        let param = ImportMnemonicParam {
+            mnemonic: OTHER_MNEMONIC.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "test-wallet".to_string(),
+            password_hint: "imtoken".to_string(),
+            overwrite: true,
+            network: "TESTNET".to_string(),
+        };
+        let ret = call_api("import_mnemonic", param).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+        let derivations = vec![PublicKeyDerivation {
+            chain_type: "ETHEREUM2".to_string(),
+            path: "m/12381/3600/0/0/0".to_string(),
+            curve: "bls12-381".to_string(),
+        }];
+        let param = GetPublicKeysParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::get_public_keys_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let result_bytes = call_api("get_public_keys", param).unwrap();
+        let result = GetPublicKeysResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(result.public_keys.get(0).unwrap(), "0x941c2ab3d28b0fe37fde727e3178738a475696aed7335c7f4c2d91d06a1540acadb8042f119fb5f8029e7765de21fac2");
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_derive_btc_legacy_sub_accounts() {
+    run_test(|| {
+        let derivation = Derivation {
+            chain_type: "BITCOIN".to_string(),
+            path: "m/44'/0'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let (_wallet, accounts) = import_and_derive(derivation);
+        let params = DeriveSubAccountsParam {
+            chain_type: "BITCOIN".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string(), "1/0".to_string()],
+            extended_public_key: accounts.accounts[0].extended_public_key.to_string(),
+        };
+
+        let result_bytes = derive_sub_accounts(&encode_message(params).unwrap()).unwrap();
+        let result = DeriveSubAccountsResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "12z6UzsA3tjpaeuvA2Zr9jwx19Azz74D6g",
+            result.accounts[0].address
+        );
+        assert_eq!(
+            "1962gsZ8PoPUYHneFakkCTrukdFMVQ4i4T",
+            result.accounts[1].address
+        );
+        assert_eq!(
+            "19vddWhyq637bqDfuKadsoy5mTNRgfb3hr",
+            result.accounts[2].address
+        );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_derive_btc_p2wpkh_sub_accounts() {
+    run_test(|| {
+        let derivation = Derivation {
+            chain_type: "BITCOIN".to_string(),
+            path: "m/49'/0'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "P2WPKH".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let (_wallet, accounts) = import_and_derive(derivation);
+        let params = DeriveSubAccountsParam {
+            chain_type: "BITCOIN".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "P2WPKH".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string(), "1/0".to_string()],
+            extended_public_key: accounts.accounts[0].extended_public_key.to_string(),
+        };
+
+        let result_bytes = derive_sub_accounts(&encode_message(params).unwrap()).unwrap();
+        let result = DeriveSubAccountsResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "3JmreiUEKn8P3SyLYmZ7C1YCd4r2nFy3Dp",
+            result.accounts[0].address
+        );
+        assert_eq!(
+            "33xJxujVGf4qBmPTnGW9P8wrKCmT7Nwt3t",
+            result.accounts[1].address
+        );
+        assert_eq!(
+            "33K4nJ6HuM4fuJct11xPPHH65dnGrN5Ggt",
+            result.accounts[2].address
+        );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_derive_eth_sub_accounts() {
+    run_test(|| {
+        let derivation = Derivation {
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let (_, accounts) = import_and_derive(derivation);
+        let params = DeriveSubAccountsParam {
+            chain_type: "ETHEREUM".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            relative_paths: vec!["0/0".to_string(), "0/1".to_string()],
+            extended_public_key: accounts.accounts[0].extended_public_key.to_string(),
+        };
+
+        let result_bytes = derive_sub_accounts(&encode_message(params).unwrap()).unwrap();
+        let result = DeriveSubAccountsResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b",
+            result.accounts[0].address
+        );
+        assert_eq!(
+            "0x80427Ae1f55bCf60ee4CD2db7549b8BC69a74303",
+            result.accounts[1].address
+        );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_mnemonic_to_public() {
+    run_test(|| {
+        let params = MnemonicToPublicKeyParam {
+            mnemonic: TEST_MNEMONIC.to_string(),
+            path: "m/44'/194'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            encoding: "EOS".to_string(),
+        };
+
+        let result_bytes = mnemonic_to_public(&encode_message(params).unwrap()).unwrap();
+        let result = MnemonicToPublicKeyResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+            result.public_key
+        );
+
+        let params = MnemonicToPublicKeyParam {
+            mnemonic: TEST_MNEMONIC.to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            encoding: "HEX".to_string(),
+        };
+
+        let result_bytes = mnemonic_to_public(&encode_message(params).unwrap()).unwrap();
+        let result = MnemonicToPublicKeyResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "0x0280c98b8ea7cab630defb0c09a4295c2193cdee016c1d5b9b0cb18572b9c370fe",
+            result.public_key
+        );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_get_extended_public_keys() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+        let derivations = vec![PublicKeyDerivation {
+            chain_type: "BITCOIN".to_string(),
+            path: "m/44'/145'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+        }];
+        let param = GetExtendedPublicKeysParam {
+            id: wallet.id,
+            derivations,
+            key: Some(api::get_extended_public_keys_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("get_extended_public_keys", param).unwrap();
+        let resp: GetExtendedPublicKeysResult =
+            GetExtendedPublicKeysResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(resp.extended_public_keys.get(0).unwrap(), "xpub6GZjFnyumLtEwC4KQkigvc3vXJdZvy71QxHTsFQQv1YtEUWNEwynKWsK2LBFZNLWdTk3w1Y9cRv4NN7V2pnDBoWgH3PkVE9r9Q2kSQL2zkH");
+    })
+}
+
+#[test]
+#[serial]
+fn polkadotjs_cross_test() {
+    run_test(|| {
+        let param = ImportMnemonicParam {
+            mnemonic: TEST_MNEMONIC.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            network: "TESTNET".to_string(),
+            name: "test-wallet".to_string(),
+            password_hint: "imtoken".to_string(),
+            overwrite: true,
+        };
+        let ret = import_mnemonic(&encode_message(param).unwrap()).unwrap();
+        let wallet = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivations = vec![
+            Derivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "//imToken//polakdot/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "//imToken//polakdot/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "//imToken//polakdot/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "//imToken//polakdot/0//1".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "KUSAMA".to_string(),
+                path: "//0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "POLKADOT".to_string(),
+                path: "//0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "sr25519".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+        ];
+        let param = DeriveAccountsParam {
+            id: wallet.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let expected = vec![
+            "148fArFqHEtURxdvYAtLkSUkuHxqzPGsaC7Ro1zaUWFJ5dNF",
+            "15YFBQp1kUWEXm22QXySuWyVZckk7QCZiuBfENLAfmbevstt",
+            "16hsF1UW1kob7vUR7tymVNCmp1eo18uhhtc4szetH4xbYpbd",
+            "FhygqLe3pdvk5SrMEePWF1cCGFS6kXux5Dh2PHBQDSGeJSW",
+            "EkkpqYe4XGLst9o8NhvFRhMwto7MNxrsW9vboMzffdwUW3F",
+            "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+            "JKZKcChQMRYd4zFdeSL5DX3EPNMtaLqAddnycJ4gEL2kJTK",
+            "16kEod7tdmg6JxBKpagHKQzBwR5mnD5nnkXXkF1TkX94BooY",
+        ];
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let result: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(result.accounts.len(), 8);
+        for (index, account) in result.accounts.iter().enumerate() {
+            assert_eq!(account.address, expected[index]);
+        }
+    })
+}
+
+#[test]
+#[serial]
+fn test_derive_other_curve_on_pk_keystore() {
+    run_test(|| {
+        let param = ImportPrivateKeyParam {
+            password: TEST_PASSWORD.to_string(),
+            private_key: TEST_PRIVATE_KEY.to_string(),
+            name: "hex pk".to_string(),
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_private_key", param).unwrap();
+        let imported = ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+
+        let derive_param = DeriveAccountsParam {
+            id: imported.id.to_string(),
+            derivations: vec![
+                Derivation {
+                    chain_type: "ETHEREUM".to_string(),
+                    chain_id: "".to_string(),
+                    path: "".to_string(),
+                    network: "".to_string(),
+                    curve: "secp256k1".to_string(),
+                    seg_wit: "".to_string(),
+                    bech32_prefix: "".to_string(),
+                },
+                Derivation {
+                    chain_type: "FILECOIN".to_string(),
+                    chain_id: "".to_string(),
+                    path: "".to_string(),
+                    network: "".to_string(),
+                    curve: "secp256k1".to_string(),
+                    seg_wit: "".to_string(),
+                    bech32_prefix: "".to_string(),
+                },
+            ],
+            key: Some(api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_string(),
+            )),
+        };
+        let ret = call_api("derive_accounts", derive_param).unwrap();
+        let accounts = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            accounts.accounts[0].address,
+            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b"
+        );
+        assert_eq!(
+            accounts.accounts[1].address,
+            "t1cwgcugpo6lmjw2h4kwxei7i7lqcuth3en3h4eli"
+        );
+
+        let derive_param = DeriveAccountsParam {
+            id: imported.id.to_string(),
+            derivations: vec![Derivation {
+                chain_type: "TEZOS".to_string(),
+                chain_id: "".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                curve: "ed25519".to_string(),
+                seg_wit: "".to_string(),
+                bech32_prefix: "".to_string(),
+            }],
+            key: Some(api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_string(),
+            )),
+        };
+        let ret = call_api("derive_accounts", derive_param);
+        assert_eq!(
+            format!("{}", ret.err().unwrap()),
+            "private_key_curve_not_match"
+        );
+
+        let derive_param = DeriveAccountsParam {
+            id: imported.id.to_string(),
+            derivations: vec![Derivation {
+                chain_type: "KUSAMA".to_string(),
+                chain_id: "".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                curve: "sr25519".to_string(),
+                seg_wit: "".to_string(),
+                bech32_prefix: "".to_string(),
+            }],
+            key: Some(api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_string(),
+            )),
+        };
+        let ret = call_api("derive_accounts", derive_param);
+        assert_eq!(
+            format!("{}", ret.err().unwrap()),
+            "private_key_curve_not_match"
+        );
+    })
+}
diff --git a/token-core/tcx/tests/export_test.rs b/token-core/tcx/tests/export_test.rs
new file mode 100644
index 00000000..9c01b0c0
--- /dev/null
+++ b/token-core/tcx/tests/export_test.rs
@@ -0,0 +1,777 @@
+use common::run_test;
+use serial_test::serial;
+
+mod common;
+
+use tcx::api::derive_accounts_param::Derivation;
+
+use tcx::handler::scan_keystores;
+use tcx::*;
+
+use prost::Message;
+use tcx::api::{
+    export_private_key_param, BackupResult, DeriveAccountsParam, DeriveAccountsResult,
+    DerivedKeyResult, ExistsKeystoreResult, ExistsPrivateKeyParam, ExportMnemonicResult,
+    ExportPrivateKeyParam, ExportPrivateKeyResult, GetPublicKeysParam, GetPublicKeysResult,
+    ImportJsonParam, ImportMnemonicParam, ImportPrivateKeyParam, ImportPrivateKeyResult,
+    KeystoreResult, PublicKeyDerivation, WalletKeyParam,
+};
+
+use tcx::handler::{encode_message, import_private_key};
+use tcx_constants::{CurveType, TEST_WIF};
+use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
+
+use std::fs;
+
+use sp_core::ByteArray;
+
+use crate::common::*;
+
+#[test]
+#[serial]
+pub fn test_export_mnemonic() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let param = WalletKeyParam {
+            id: wallet.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("export_mnemonic", param).unwrap();
+        let result: ExportMnemonicResult = ExportMnemonicResult::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(result.mnemonic, TEST_MNEMONIC);
+
+        let wallet = import_default_pk_store();
+
+        let param = WalletKeyParam {
+            id: wallet.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        unsafe { clear_err() };
+        let ret = call_api("export_mnemonic", param);
+        assert!(ret.is_err());
+        assert_eq!(
+            format!("{}", ret.err().unwrap()),
+            "private_keystore_cannot_export_mnemonic"
+        );
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_tezos_import_private_key_export() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+                private_key: "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH".to_string(),
+                password: TEST_PASSWORD.to_string(),
+                name: "test_tezos_import_private_key_export".to_string(),
+                password_hint: "".to_string(),
+                network: "".to_string(),
+                overwrite: true,
+            };
+
+        let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivations = vec![Derivation {
+            chain_type: "TEZOS".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "tz1QSHaKpTFhgHLbqinyYRjxD5sLcbfbzhxy",
+            derived_accounts.accounts[0].address
+        );
+
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+                private_key: "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH"
+                    .to_string(),
+            };
+
+        let ret_bytes = call_api("exists_private_key", param).unwrap();
+        let result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(result.is_exists);
+        assert_eq!(result.id, import_result.id);
+
+        let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_string(),
+            )),
+            chain_type: "TEZOS".to_string(),
+            network: "MAINNET".to_string(),
+            curve: "ed25519".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+        };
+        let ret_bytes = call_api("export_private_key", param).unwrap();
+        let export_result: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+                "edskRgu8wHxjwayvnmpLDDijzD3VZDoAH7ZLqJWuG4zg7LbxmSWZWhtkSyM5Uby41rGfsBGk4iPKWHSDniFyCRv3j7YFCknyHH",
+                export_result.private_key
+            );
+
+        let param: GetPublicKeysParam = GetPublicKeysParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::get_public_keys_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![PublicKeyDerivation {
+                chain_type: "TEZOS".to_string(),
+                path: "".to_string(),
+                curve: CurveType::ED25519.as_str().to_string(),
+            }],
+        };
+        let ret_bytes = call_api("get_public_keys", param).unwrap();
+        let public_key_result: GetPublicKeysResult =
+            GetPublicKeysResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "edpkvQtuhdZQmjdjVfaY9Kf4hHfrRJYugaJErkCGvV3ER1S7XWsrrj",
+            public_key_result.public_keys[0]
+        );
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_tezos_hd_private_key_export() {
+    run_test(|| {
+        let import_result = import_default_wallet();
+
+        let derivations = vec![Derivation {
+            chain_type: "TEZOS".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "ed25519".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz",
+            derived_accounts.accounts[0].address
+        );
+
+        let export_param = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "TEZOS".to_string(),
+            network: "".to_string(),
+            curve: "secp256k1".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+        };
+        let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
+        let export_pk: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(export_pk_bytes.as_slice()).unwrap();
+        assert_eq!(
+                export_pk.private_key,
+                "edskRjTYrWf4xZje3NbZ7WCYXwY4DqL4WwyYbbnv8opNa1tNHo9AcLaB6sV42uqeTohjzu5ohTTn9vQg5EJ4cDcTZTtrDi4Fxn"
+            );
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_private_key_store_export() {
+    run_test(|| {
+        let import_result = import_default_pk_store();
+        let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "BITCOINCASH".to_string(),
+            network: "MAINNET".to_string(),
+            curve: "secp256k1".to_string(),
+            path: "m/44'/0'/0'/0/0".to_string(),
+        };
+        let ret_bytes = call_api("export_private_key", param).unwrap();
+        let export_result: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
+            export_result.private_key
+        );
+
+        let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "BITCOINCASH".to_string(),
+            network: "TESTNET".to_string(),
+            curve: "secp256k1".to_string(),
+            path: "m/44'/0'/0'/0/0".to_string(),
+        };
+        let ret_bytes = call_api("export_private_key", param).unwrap();
+        let export_result: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "cT4fTJyLd5RmSZFHnkGmVCzXDKuJLbyTt7cy77ghTTCagzNdPH1j",
+            export_result.private_key
+        );
+
+        let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "TRON".to_string(),
+            network: "".to_string(),
+            curve: "secp256k1".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+        };
+        let ret_bytes = call_api("export_private_key", param).unwrap();
+        let export_result: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
+            export_result.private_key
+        );
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_export_private_key() {
+    run_test(|| {
+        let derivations = vec![
+            Derivation {
+                chain_type: "BITCOINCASH".to_string(),
+                path: "".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOINCASH".to_string(),
+                path: "".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "TRON".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "FILECOIN".to_string(),
+                path: "".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "EOS".to_string(),
+                path: "".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+        ];
+        let pks = vec![
+                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
+                "cT4fTJyLd5RmSZFHnkGmVCzXDKuJLbyTt7cy77ghTTCagzNdPH1j",
+                "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
+                "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6",
+                "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d",
+                "cT4fTJyLd5RmSZFHnkGmVCzXDKuJLbyTt7cy77ghTTCagzNdPH1j",
+                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
+                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
+                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
+                "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB",
+                "5K4KoY2vWgb6jAh7D5rzM93NRwjo9RDQkHsdvrSeNbnfqpgVJKh",
+            ];
+
+        for idx in 0..pks.len() {
+            let (import_result, acc_rsp) = import_pk_and_derive(derivations[idx].clone());
+            let acc = acc_rsp.accounts.first().unwrap().clone();
+            let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+                id: import_result.id.to_string(),
+                key: Some(crate::api::export_private_key_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+                chain_type: acc.chain_type.to_string(),
+                network: derivations[idx].network.to_string(),
+                curve: "secp256k1".to_string(),
+                path: "".to_string(),
+            };
+            let ret_bytes = call_api("export_private_key", param).unwrap();
+            let export_result: ExportPrivateKeyResult =
+                ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+
+            // test export as mainnet
+            assert_eq!(pks[idx], export_result.private_key);
+            remove_created_wallet(&import_result.id);
+        }
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_export_private_key_from_hd_store() {
+    run_test(|| {
+        let pks = vec![
+                "L39VXyorp19JfsEJfbD7Tfr4pBEX93RJuVXW7E13C51ZYAhUWbYa",
+                "KyLGdagds7tY1vupT5Kf8C1Cc5wkzzWRK51e4vsh1svCSvYk4Abo",
+                "cN4b1V3cicEexrYXiEhaWEdURyhZiVX6PzAZNFSzZaWfSNZG2cJX",
+                "b2a3f2ad9ea57b03aae9584a50b36e8b8f9ddfdc1b5c2ca26f90a041fb28f260",
+                "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a222f5059574777574e577a58614d5675437a613958502b314b4a695a4474696f4c76777863754268783041553d227d",
+                "7b2254797065223a22626c73222c22507269766174654b6579223a226e763064516a49635965556341682f6a792b6d7a77656a306c4a75495447504238433938766576713046513d227d",
+                "cce64585e3b15a0e4ee601a467e050c9504a0db69a559d7ec416fa25ad3410c2",
+                "cSLf8bi4X2EBNBDagaKuzkLB7jonh1Rqp6is2Md6wDdXMekFqFzN",
+                "KxBhnk7DGkXY7Fsw4MaRGXtHrmeqpxxc6u1Rr9aGjNQhH514gkU4",
+                "KzDsQasE4c45YHDiuidSiiss85Srs913BQeWcTthv4Y6bvBSio9w",
+                "KxVvPYS7mmZpmVTpakwWhqgZsutEa2qVqTxoQ5DfcGPNV1h84jxe",
+                "L1FaeGmj8cAFY2d6fnux6LtzD9yKyqGRF3FTmxTdu4Z4ACVzJotJ",
+                "5KAigHMamRhN7uwHFnk3yz7vUTyQT1nmXoAA899XpZKJpkqsPFp",
+                "T4oDFhweKSqfPjiebJb6hoCLJKNFsWTYHfodfGyuoGy5yHoete7k",
+                "edskS3E5CLrkwHRYAbDvw5xC913C9GGseMcyNGeGbeaD57Yvvi2jqizpAAZyzUtRK626UvkKYdJwCYE9oKMcqFCtJeBpDYcrVH"
+            ];
+        let export_info = vec![
+            ("m/44'/145'/0'/0/0", "BITCOINCASH", "MAINNET", "secp256k1"),
+            ("m/44'/145'/0'/0/1", "BITCOINCASH", "MAINNET", "secp256k1"),
+            ("m/44'/1'/0'/0/1", "BITCOINCASH", "TESTNET", "secp256k1"),
+            ("m/44'/195'/0'/0/0", "TRON", "", "secp256k1"),
+            ("m/44'/461'/0'/0/0", "FILECOIN", "MAINNET", "secp256k1"),
+            ("m/2334/461/0/0", "FILECOIN", "MAINNET", "bls12-381"),
+            ("m/44'/60'/0'/0/0", "ETHEREUM", "", "secp256k1"),
+            ("m/44'/1'/0'/0/0", "BITCOIN", "TESTNET", "secp256k1"),
+            ("m/44'/0'/0'/0/0", "BITCOIN", "MAINNET", "secp256k1"),
+            ("m/49'/0'/0'/0/0", "BITCOIN", "MAINNET", "secp256k1"),
+            ("m/84'/0'/0'/0/0", "BITCOIN", "MAINNET", "secp256k1"),
+            ("m/86'/0'/0'/0/0", "BITCOIN", "MAINNET", "secp256k1"),
+            ("m/44'/194'/0'/0/0", "EOS", "", "secp256k1"),
+            ("m/44'/2'/0'/0/0", "LITECOIN", "MAINNET", "secp256k1"),
+            ("m/44'/1729'/0'/0'", "TEZOS", "", "ed25519"),
+        ];
+
+        let import_result = import_default_wallet();
+        for idx in 0..export_info.len() {
+            let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+                id: import_result.id.to_string(),
+                key: Some(crate::api::export_private_key_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+                chain_type: export_info[idx].1.to_string(),
+                network: export_info[idx].2.to_string(),
+                curve: export_info[idx].3.to_string(),
+                path: export_info[idx].0.to_string(),
+            };
+            let ret_bytes = call_api("export_private_key", param).unwrap();
+            let export_result: ExportPrivateKeyResult =
+                ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+
+            assert_eq!(pks[idx], export_result.private_key);
+        }
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_chain_cannot_export_private_key() {
+    run_test(|| {
+        let derivations = vec![Derivation {
+            chain_type: "COSMOS".to_string(),
+            path: "m/44'/118'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+
+        let export_info = vec![
+            ("m/44'/118'/0'/0/0", "COSMOS", "secp256k1"),
+            ("m/44'/434'/0'/0/0", "KUSAMA", "sr25519"),
+            ("m/44'/354'/0'/0/0", "POLKADOT", "sr25519"),
+        ];
+
+        let import_result = import_default_wallet();
+        for idx in 0..derivations.len() {
+            let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+                id: import_result.id.to_string(),
+                key: Some(crate::api::export_private_key_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+                chain_type: export_info[idx].1.to_string(),
+                network: "".to_string(),
+                curve: export_info[idx].2.to_string(),
+                path: export_info[idx].1.to_string(),
+            };
+            let ret = call_api("export_private_key", param);
+
+            assert!(ret.is_err());
+        }
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_backup_v3_keystore() {
+    run_test(|| {
+        let json = r#"{
+                "version": 3,
+                "id": "5c24e96a-8fd8-4872-9702-3fd2fc9166cd",
+                "crypto": {
+                  "cipher": "aes-128-ctr",
+                  "cipherparams": { "iv": "56ed1daad9226d7edd75e8ab34e32309" },
+                  "ciphertext": "95cae71ef4d76c3def64bf77d267608a823fc65cda6254ea24d1cbbe09de6b6b",
+                  "kdf": "pbkdf2",
+                  "kdfparams": {
+                    "c": 262144,
+                    "prf": "hmac-sha256",
+                    "dklen": 32,
+                    "salt": "63c89a7275a65bd659a937fe374c668e5aa3b05a9b0ef3ec9178aa9182f42666"
+                  },
+                  "mac": "2adc6da2f5f183e528a063b36ebeddaf0d3a90269ef797b99dc143d58ba3bb58"
+                },
+                "address": "0x6031564e7b2F5cc33737807b2E58DaFF870B590b"
+              }
+              "#;
+
+        let param: ImportJsonParam = ImportJsonParam {
+            password: TEST_PASSWORD.to_string(),
+            json: json.to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_json", param).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            vec!["ETHEREUM".to_string()],
+            import_result.identified_chain_types
+        );
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("backup", param).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert!(export_result
+            .original
+            .contains("0x6031564e7b2F5cc33737807b2E58DaFF870B590b"));
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+
+        let ret = call_api("get_derived_key", param).unwrap();
+        let derived_key_result: DerivedKeyResult =
+            DerivedKeyResult::decode(ret.as_slice()).unwrap();
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::DerivedKey(
+                derived_key_result.derived_key,
+            )),
+        };
+        let ret = call_api("backup", param).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert!(export_result
+            .original
+            .contains("0x6031564e7b2F5cc33737807b2E58DaFF870B590b"));
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_backup_pjs_kystore() {
+    run_test(|| {
+        let keystore_str: &str = r#"{
+                "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+                "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
+                "encoding": {
+                    "content": [
+                    "pkcs8",
+                    "sr25519"
+                    ],
+                    "type": "xsalsa20-poly1305",
+                    "version": "2"
+                },
+                "meta": {
+                    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
+                    "name": "i_can_save_name",
+                    "tags": [],
+                    "whenCreated": 1593591324334
+                }
+                }"#;
+        let param: ImportJsonParam = ImportJsonParam {
+            password: TEST_PASSWORD.to_string(),
+            json: keystore_str.to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_json", param).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            vec!["KUSAMA".to_string(), "POLKADOT".to_string(),],
+            import_result.identified_chain_types
+        );
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("backup", param).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert!(export_result
+            .original
+            .contains("JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"));
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+
+        let ret = call_api("get_derived_key", param).unwrap();
+        let derived_key_result: DerivedKeyResult =
+            DerivedKeyResult::decode(ret.as_slice()).unwrap();
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::DerivedKey(
+                derived_key_result.derived_key,
+            )),
+        };
+        let ret = call_api("backup", param).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert!(export_result
+            .original
+            .contains("JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"));
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_backup_private_key() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            password: TEST_PASSWORD.to_string(),
+            private_key: TEST_WIF.to_string(),
+            name: "".to_string(),
+            password_hint: "".to_string(),
+            network: "TESTNET".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_private_key", param).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            vec![
+                "BITCOIN".to_string(),
+                "BITCOINCASH".to_string(),
+                "LITECOIN".to_string()
+            ],
+            import_result.identified_chain_types
+        );
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("backup", param).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(export_result.original, TEST_WIF);
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+
+        let ret = call_api("get_derived_key", param).unwrap();
+        let derived_key_result: DerivedKeyResult =
+            DerivedKeyResult::decode(ret.as_slice()).unwrap();
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::DerivedKey(
+                derived_key_result.derived_key,
+            )),
+        };
+        let ret = call_api("backup", param.clone()).unwrap();
+        let backup_result = BackupResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(backup_result.original, TEST_WIF);
+
+        change_fingerprint_in_keystore(&import_result.id, &import_result.source_fingerprint);
+        scan_keystores().unwrap();
+
+        let ret = call_api("backup", param);
+        assert_eq!(format!("{}", ret.err().unwrap()), "fingerprint_not_match");
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_backup_mnemonic() {
+    run_test(|| {
+        let param: ImportMnemonicParam = ImportMnemonicParam {
+            password: TEST_PASSWORD.to_string(),
+            mnemonic: TEST_MNEMONIC.to_string(),
+            password_hint: "".to_string(),
+            name: "".to_string(),
+            network: "MAINNET".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_mnemonic", param).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("backup", param).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(export_result.original, TEST_MNEMONIC.to_string());
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+
+        let ret = call_api("get_derived_key", param).unwrap();
+        let derived_key_result: DerivedKeyResult =
+            DerivedKeyResult::decode(ret.as_slice()).unwrap();
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::DerivedKey(
+                derived_key_result.derived_key,
+            )),
+        };
+        let ret = call_api("backup", param.clone()).unwrap();
+        let export_result: BackupResult = BackupResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(export_result.original, TEST_MNEMONIC.to_string());
+
+        change_fingerprint_in_keystore(&import_result.id, &import_result.source_fingerprint);
+        scan_keystores().unwrap();
+
+        let ret = call_api("backup", param);
+        assert_eq!(format!("{}", ret.err().unwrap()), "fingerprint_not_match");
+    })
+}
+
+fn change_fingerprint_in_keystore(id: &str, fingerprint: &str) {
+    let file_path = format!("/tmp/imtoken/walletsV2/{}.json", id);
+    let contents = fs::read_to_string(&file_path).unwrap();
+    let new_contents = contents.replace(fingerprint, "0x00000000000000000000");
+    fs::write(file_path, new_contents).expect("change fingerprint");
+}
diff --git a/token-core/tcx/tests/import_test.rs b/token-core/tcx/tests/import_test.rs
new file mode 100644
index 00000000..2c154b0f
--- /dev/null
+++ b/token-core/tcx/tests/import_test.rs
@@ -0,0 +1,1276 @@
+use common::run_test;
+use serial_test::serial;
+
+mod common;
+
+use tcx::api::derive_accounts_param::Derivation;
+
+use tcx::*;
+
+use tcx_keystore::keystore::IdentityNetwork;
+
+use prost::Message;
+use tcx::api::{
+    export_private_key_param, CreateKeystoreParam, DeriveAccountsParam, DeriveAccountsResult,
+    ExistsJsonParam, ExistsKeystoreResult, ExistsPrivateKeyParam, ExportJsonParam,
+    ExportJsonResult, ExportPrivateKeyParam, ExportPrivateKeyResult, ImportJsonParam,
+    ImportMnemonicParam, ImportPrivateKeyParam, ImportPrivateKeyResult, KeystoreResult,
+};
+
+use tcx::handler::{encode_message, import_private_key};
+use tcx_constants::TEST_PASSWORD;
+use tcx_constants::{CurveType, TEST_PRIVATE_KEY, TEST_WIF};
+
+use sp_core::ByteArray;
+
+use tcx_substrate::SubstrateKeystore;
+
+use crate::common::*;
+use tcx::handler::derive_accounts;
+
+#[test]
+#[serial]
+pub fn test_create_keystore() {
+    run_test(|| {
+        let param = CreateKeystoreParam {
+            password: TEST_PASSWORD.to_string(),
+            password_hint: "hint".to_string(),
+            name: "aaa".to_string(),
+            network: IdentityNetwork::Mainnet.to_string(),
+        };
+
+        let ret = call_api("create_keystore", param).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(import_result.name, "aaa");
+        assert_eq!(import_result.source, "NEW_MNEMONIC");
+        assert!(!import_result.identifier.is_empty());
+        assert!(!import_result.ipfs_id.is_empty());
+        assert!(!import_result.source_fingerprint.is_empty());
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_mnemonic() {
+    run_test(|| {
+        let import_result: KeystoreResult = import_default_wallet();
+        assert_eq!(import_result.source, "MNEMONIC");
+        assert_eq!(
+            import_result.source_fingerprint,
+            "0x1468dba9c246fe22183c056540ab4d8b04553217"
+        );
+        assert_eq!(
+            import_result.identifier,
+            "im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf"
+        );
+        assert_eq!(
+            import_result.ipfs_id,
+            "QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6"
+        );
+
+        let derivation = Derivation {
+            chain_type: "BITCOINCASH".to_string(),
+            path: "m/44'/145'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let result: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+        let account = result.accounts.first().unwrap();
+        assert_eq!(account.chain_type, "BITCOINCASH");
+        assert_eq!(
+            account.address,
+            "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r"
+        );
+        assert_eq!(
+                account.extended_public_key,
+                "xpub6Bmkv3mmRZZWoFSBdj9vDMqR2PCPSP6DEj8u3bBuv44g3Ncnro6cPVqZAw6wTEcxHQuodkuJG4EmAinqrrRXGsN3HHnRRMtAvzfYTiBATV1"
+            );
+        assert_eq!(
+                account.encrypted_extended_public_key,
+                "wAKUeR6fOGFL+vi50V+MdVSH58gLy8Jx7zSxywz0tN++l2E0UNG7zv+R1FVgnrqU6d0wl699Q/I7O618UxS7gnpFxkGuK0sID4fi7pGf9aivFxuKy/7AJJ6kOmXH1Rz6FCS6b8W7NKlzgbcZpJmDsQ=="
+            );
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_mnemonic_invalid_params() {
+    run_test(|| {
+        let invalid_mnemonics = vec![
+            "inject kidney empty canal shadow pact comfort wife crush horse",
+            "inject kidney empty canal shadow pact comfort wife crush horse wife wife",
+            "inject kidney empty canal shadow pact comfort wife crush horse hello",
+        ];
+        for mn in invalid_mnemonics {
+            let param = ImportMnemonicParam {
+                mnemonic: mn.to_string(),
+                password: TEST_PASSWORD.to_string(),
+                network: "TESTNET".to_string(),
+                name: "test-wallet".to_string(),
+                password_hint: "imtoken".to_string(),
+                overwrite: true,
+            };
+
+            let ret = call_api("import_mnemonic", param);
+            assert!(ret.is_err());
+        }
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_mnemonic_ltc() {
+    run_test(|| {
+        let import_result: KeystoreResult = import_default_wallet();
+
+        let derivation = Derivation {
+            chain_type: "LITECOIN".to_string(),
+            path: "m/44'/1'/0'/0/0".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let result: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(result.accounts.first().unwrap().chain_type, "LITECOIN");
+        assert_eq!(
+            result.accounts.first().unwrap().address,
+            "mkeNU5nVnozJiaACDELLCsVUc8Wxoh1rQN"
+        );
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_private_key() {
+    run_test(|| {
+        let import_result = import_default_pk_store();
+        assert_eq!(
+            import_result.identifier,
+            "im14x5UPbCXmU2HMQ8jfeKcCDrQYhDppRYaa5C6"
+        );
+        assert_eq!(
+            import_result.ipfs_id,
+            "QmczBPUeohPPaE8UnPiESyynPwffBqrn4RqrU6nPJw95VT"
+        );
+        assert_eq!(
+            import_result.source_fingerprint,
+            "0xe6cfaab9a59ba187f0a45db0b169c21bb48f09b3"
+        );
+        assert_eq!(import_result.source, "WIF");
+
+        let derivations = vec![
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/44'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/49'/2'/0'/0/0".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "LITECOIN".to_string(),
+                path: "m/49'/1'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "NERVOS".to_string(),
+                path: "m/44'/309'/0'/0/0".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "ETHEREUM".to_string(),
+                path: "m/44'/60'/0'/0/0".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "COSMOS".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "EOS".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "TESTNET".to_string(),
+                seg_wit: "NONE".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "P2WPKH".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_0".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+            Derivation {
+                chain_type: "BITCOIN".to_string(),
+                path: "pk_not_need_path".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "VERSION_1".to_string(),
+                chain_id: "".to_string(),
+                curve: "secp256k1".to_string(),
+                bech32_prefix: "".to_string(),
+            },
+        ];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(13, derived_accounts.accounts.len());
+        assert_eq!(
+            "LgGNTHMkgETS7oQcoekvACJQcH355xECog",
+            derived_accounts.accounts[0].address
+        );
+        assert_eq!("", derived_accounts.accounts[0].extended_public_key);
+
+        assert_eq!(
+            "MR5Hu9zXPX3o9QuYNJGft1VMpRP418QDfW",
+            derived_accounts.accounts[1].address
+        );
+        assert_eq!("", derived_accounts.accounts[1].extended_public_key);
+
+        assert_eq!(
+            "n2ZNV88uQbede7C5M5jzi6SyG4GVuPpng6",
+            derived_accounts.accounts[2].address
+        );
+        assert_eq!("", derived_accounts.accounts[2].extended_public_key);
+
+        assert_eq!(
+            "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG",
+            derived_accounts.accounts[3].address
+        );
+        assert_eq!("", derived_accounts.accounts[3].extended_public_key);
+
+        assert_eq!(
+            "ckt1qyqpavderq5jjxh6qhxeks4t706kglffkyassx7h5z",
+            derived_accounts.accounts[4].address
+        );
+
+        assert_eq!(
+            "0xef678007D18427E6022059Dbc264f27507CD1ffC",
+            derived_accounts.accounts[5].address
+        );
+
+        assert_eq!(
+            "cosmos1um864wd9nwsc0u9ytkctz6wzrw6g7zdnapqz35",
+            derived_accounts.accounts[6].address
+        );
+
+        assert_eq!(
+            "EOS5Vubes67f2xXCRDJXx5WJRsMBuf4gTfzukbqLnyjZQCyoPjPZu",
+            derived_accounts.accounts[7].public_key
+        );
+
+        assert_eq!(
+            "1N3RC53vbaDNrziTdWmctBEeQ4fo4quNpq",
+            derived_accounts.accounts[8].address
+        );
+
+        assert_eq!(
+            "n2ZNV88uQbede7C5M5jzi6SyG4GVuPpng6",
+            derived_accounts.accounts[9].address
+        );
+
+        assert_eq!(
+            "3Js9bGaZSQCNLudeGRHL4NExVinc25RbuG",
+            derived_accounts.accounts[10].address
+        );
+
+        assert_eq!(
+            "bc1qum864wd9nwsc0u9ytkctz6wzrw6g7zdntm7f4e",
+            derived_accounts.accounts[11].address
+        );
+
+        assert_eq!(
+            "bc1pqpae4d6594jj3yueluku5tlu7r6nqwm24xc8thk5g396s9e5anvq6x4n33",
+            derived_accounts.accounts[12].address
+        );
+
+        // pk rederive
+        let derivations = vec![Derivation {
+            chain_type: "LITECOIN".to_string(),
+            path: "m/44'/2'/0'/0/0".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "LgGNTHMkgETS7oQcoekvACJQcH355xECog",
+            derived_accounts.accounts[0].address
+        );
+        assert_eq!("", derived_accounts.accounts[0].extended_public_key);
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_filecoin_private_key_secp256k1_import() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+                private_key: "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d"
+                    .to_string(),
+                password: TEST_PASSWORD.to_string(),
+                name: "test_filecoin_import_private_key".to_string(),
+                password_hint: "".to_string(),
+                network: "".to_string(),
+                overwrite: true,
+            };
+
+        let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivations = vec![Derivation {
+            chain_type: "FILECOIN".to_string(),
+            path: "".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+
+        assert_eq!(1, derived_accounts.accounts.len());
+
+        assert_eq!(
+            "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i",
+            derived_accounts.accounts[0].address
+        );
+
+        let export_param = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "FILECOIN".to_string(),
+            network: "".to_string(),
+            curve: "secp256k1".to_string(),
+            path: "".to_string(),
+        };
+
+        let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
+        let export_pk: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(export_pk_bytes.as_slice()).unwrap();
+        assert_eq!(
+                export_pk.private_key,
+                "7b2254797065223a22736563703235366b31222c22507269766174654b6579223a226f354a6754767776725a774c5061513758326d4b4c6a386e4478634e685a6b537667315564434a317866593d227d"
+            );
+
+        remove_created_wallet(&import_result.id);
+    });
+}
+
+#[test]
+#[serial]
+pub fn test_filecoin_private_key_bls_import() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+                private_key: "7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d"
+                    .to_string(),
+                password: TEST_PASSWORD.to_string(),
+                name: "test_filecoin_import_private_key".to_string(),
+                password_hint: "".to_string(),
+                network: "".to_string(),
+                overwrite: true,
+            };
+
+        let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivations = vec![Derivation {
+            chain_type: "FILECOIN".to_string(),
+            path: "".to_string(),
+            network: "TESTNET".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "bls12-381".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(1, derived_accounts.accounts.len());
+
+        assert_eq!(
+                "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa",
+                derived_accounts.accounts[0].address
+            );
+
+        let export_param = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "FILECOIN".to_string(),
+            network: "".to_string(),
+            curve: "bls12-381".to_string(),
+            path: "".to_string(),
+        };
+
+        let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
+        let export_pk: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(export_pk_bytes.as_slice()).unwrap();
+        assert_eq!(
+                export_pk.private_key,
+                "7b2254797065223a22626c73222c22507269766174654b6579223a2269376b4f2b7a78633651532b7637597967636d555968374d55595352657336616e6967694c684b463830383d227d"
+            );
+
+        remove_created_wallet(&import_result.id);
+    });
+}
+
+#[test]
+#[serial]
+pub fn test_fil_bls_tezos_reimport() {
+    run_test(|| {
+        let hd_import_result = import_default_wallet();
+        let test_case = vec![
+            (
+                "TEZOS".to_string(),
+                "m/44'/1729'/0'/0'".to_string(),
+                "ed25519".to_string(),
+            ),
+            (
+                "FILECOIN".to_string(),
+                "m/2334/461/0/0".to_string(),
+                "bls12-381".to_string(),
+            ),
+        ];
+
+        for case in test_case.iter() {
+            let derivations = vec![Derivation {
+                chain_type: case.0.to_string(),
+                path: case.1.to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: case.2.to_string(),
+                bech32_prefix: "".to_string(),
+            }];
+            let param = DeriveAccountsParam {
+                id: hd_import_result.id.to_string(),
+                key: Some(crate::api::derive_accounts_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+                derivations,
+            };
+            let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+            let derived_accounts: DeriveAccountsResult =
+                DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+
+            let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+                id: hd_import_result.id.to_string(),
+                key: Some(export_private_key_param::Key::Password(
+                    TEST_PASSWORD.to_string(),
+                )),
+                chain_type: case.0.to_string(),
+                network: "MAINNET".to_string(),
+                curve: case.2.to_string(),
+                path: case.1.to_string(),
+            };
+            let ret_bytes = call_api("export_private_key", param).unwrap();
+            let export_result: ExportPrivateKeyResult =
+                ExportPrivateKeyResult::decode(ret_bytes.as_slice()).unwrap();
+
+            let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+                private_key: export_result.private_key.to_string(),
+                password: TEST_PASSWORD.to_string(),
+                name: "reimport".to_string(),
+                password_hint: "".to_string(),
+                network: "".to_string(),
+                overwrite: true,
+            };
+
+            let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+            let pk_import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+            let derivations = vec![Derivation {
+                chain_type: case.0.to_string(),
+                path: case.1.to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                chain_id: "".to_string(),
+                curve: case.2.to_string(),
+                bech32_prefix: "".to_string(),
+            }];
+            let param = DeriveAccountsParam {
+                id: pk_import_result.id.to_string(),
+                key: Some(crate::api::derive_accounts_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+                derivations,
+            };
+            let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+            let pk_derived_accounts: DeriveAccountsResult =
+                DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+            assert_eq!(
+                derived_accounts.accounts.first().unwrap().address,
+                pk_derived_accounts.accounts.first().unwrap().address
+            );
+        }
+    });
+}
+
+#[test]
+#[serial]
+pub fn test_import_sr25519_private_key() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+                private_key: "0x416c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f"
+                    .to_string(),
+                password: TEST_PASSWORD.to_string(),
+                name: "test_64bytes_import_private_key".to_string(),
+                password_hint: "".to_string(),
+                network: "".to_string(),
+                overwrite: true,
+            };
+
+        let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            "im14x5JEvG1gEwF9ukFv5EsVyQ47V3BegEA3hVa",
+            import_result.identifier
+        );
+
+        let derivations = vec![Derivation {
+            chain_type: "POLKADOT".to_string(),
+            path: "".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "sr25519".to_string(),
+            bech32_prefix: "".to_string(),
+        }];
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let derived_accounts_bytes = call_api("derive_accounts", param).unwrap();
+        let derived_accounts: DeriveAccountsResult =
+            DeriveAccountsResult::decode(derived_accounts_bytes.as_slice()).unwrap();
+        assert_eq!(1, derived_accounts.accounts.len());
+
+        assert_eq!(
+            "133smEABgtt8FRkZGrZfAzCV522bxo2y5FwVoTcSaY8z1nEq",
+            derived_accounts.accounts[0].address
+        );
+
+        let export_param = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "POLKADOT".to_string(),
+            network: "".to_string(),
+            curve: "sr25519".to_string(),
+            path: "".to_string(),
+        };
+
+        let export_pk_bytes = call_api("export_private_key", export_param).unwrap();
+        let export_pk: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(export_pk_bytes.as_slice()).unwrap();
+        assert_eq!(
+                export_pk.private_key,
+                "0x406c696365202020202020202020202020202020202020202020202020202020d172a74cda4c865912c32ba0a80a57ae69abae410e5ccb59dee84e2f4432db4f"
+            );
+
+        let export_param = ExportJsonParam {
+            id: import_result.id.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            chain_type: "POLKADOT".to_string(),
+            path: "".to_string(),
+        };
+
+        let export_pk_bytes = call_api("export_json", export_param).unwrap();
+        let export_pk: ExportJsonResult =
+            ExportJsonResult::decode(export_pk_bytes.as_slice()).unwrap();
+        assert!(export_pk
+            .json
+            .contains("133smEABgtt8FRkZGrZfAzCV522bxo2y5FwVoTcSaY8z1nEq"));
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_to_pk_which_from_hd() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: "L39VXyorp19JfsEJfbD7Tfr4pBEX93RJuVXW7E13C51ZYAhUWbYa".to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "test_import_to_pk_which_from_hd".to_string(),
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: true,
+        };
+
+        let ret = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let wallet: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivation = Derivation {
+            chain_type: "BITCOINCASH".to_string(),
+            path: "".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let derive_param = DeriveAccountsParam {
+            id: wallet.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+        let ret_bytes = derive_accounts(&encode_message(derive_param).unwrap()).unwrap();
+        let ret: DeriveAccountsResult = DeriveAccountsResult::decode(ret_bytes.as_slice()).unwrap();
+        assert_eq!(
+            "qzld7dav7d2sfjdl6x9snkvf6raj8lfxjcj5fa8y2r",
+            ret.accounts.first().unwrap().address
+        );
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_substrate_keystore() {
+    run_test(|| {
+        let wrong_keystore_str: &str = r#"{
+                "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+                "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
+                "encoding": {
+                    "content": [
+                    "pkcs8",
+                    "sr25519"
+                    ],
+                    "type": "",
+                    "version": "2"
+                },
+                "meta": {
+                    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
+                    "name": "i_can_save_name",
+                    "tags": [],
+                    "whenCreated": 1593591324334
+                }
+                }"#;
+
+        let param = ImportJsonParam {
+            json: wrong_keystore_str.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            overwrite: true,
+        };
+
+        let ret = call_api("exists_json", param.clone());
+
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "decrypt_json_error");
+
+        let keystore_str: &str = r#"{
+                "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+                "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
+                "encoding": {
+                    "content": [
+                    "pkcs8",
+                    "sr25519"
+                    ],
+                    "type": "xsalsa20-poly1305",
+                    "version": "2"
+                },
+                "meta": {
+                    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
+                    "name": "i_can_save_name",
+                    "tags": [],
+                    "whenCreated": 1593591324334
+                }
+                }"#;
+
+        let param = ExistsJsonParam {
+            json: keystore_str.to_string(),
+            password: TEST_PASSWORD.to_string(),
+        };
+        // let param_bytes = encode_message(param).unwrap();
+
+        let ret_bytes = call_api("exists_json", param.clone()).unwrap();
+
+        let exists_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(!exists_result.is_exists);
+
+        let ret_bytes = call_api("import_json", param.clone()).unwrap();
+        let wallet_ret: KeystoreResult = KeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+
+        let ret_bytes = call_api("exists_json", param.clone()).unwrap();
+        let exists_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(exists_result.is_exists);
+
+        let derivation = Derivation {
+            chain_type: "KUSAMA".to_string(),
+            path: "".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let param = DeriveAccountsParam {
+            id: wallet_ret.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let accounts: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(
+            accounts.accounts[0].address,
+            "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
+        );
+
+        let export_param = ExportPrivateKeyParam {
+            id: wallet_ret.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "KUSAMA".to_string(),
+            network: "".to_string(),
+            curve: "sr25519".to_string(),
+            path: "".to_string(),
+        };
+        let ret = call_api("export_json", export_param).unwrap();
+        let keystore_ret: ExportJsonResult = ExportJsonResult::decode(ret.as_slice()).unwrap();
+
+        let keystore: SubstrateKeystore = serde_json::from_str(&keystore_ret.json).unwrap();
+        assert!(keystore.validate().is_ok());
+        assert_eq!(
+            keystore.address,
+            "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
+        );
+        assert_eq!(keystore.meta.name, "i_can_save_name");
+        assert!(keystore.meta.when_created > 1594102917);
+
+        // assert_eq!(keystore_ret.fixtures, "");
+        remove_created_wallet(&wallet_ret.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_substrate_keystore_v3() {
+    run_test(|| {
+        let keystore_str: &str = r#"{
+                "encoded": "nvrLmNETK/X6M5mylXX1g1++zpnULbYM8Da2NxI7Xe4AgAAAAQAAAAgAAAATe9CosvVLlmy71DcyeOI8BCRhPDmDGbFJJixjDOp6i6nTmkD1PvOVuSWmVQGeTMLl/nZfkmOiSrRc/u9UTBL4uJVuKxupBbsKdWmRx7ftm2E77SG9VtOrJDdpmcmID8Elk9ZtDGudz+5Chehffhx2UYZPVdxFRDDnIH9fTUJT3+DYVx/2X2dlcyRwU4O2iWLcI4ud9Hh271D9YGkh",
+                "encoding": {
+                  "content": ["pkcs8", "sr25519"],
+                  "type": ["scrypt", "xsalsa20-poly1305"],
+                  "version": "3"
+                },
+                "address": "5EhpTExwgK3VMfoawHrpLejmjuoUx7vNb6kF8SpHPzNnNBs3",
+                "meta": {
+                  "genesisHash": "",
+                  "name": "test account",
+                  "whenCreated": 1702811906958
+                }
+              }"#;
+
+        let param = ExistsJsonParam {
+            json: keystore_str.to_string(),
+            password: TEST_PASSWORD.to_string(),
+        };
+        // let param_bytes = encode_message(param).unwrap();
+
+        let ret_bytes = call_api("exists_json", param.clone()).unwrap();
+
+        let exists_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(!exists_result.is_exists);
+
+        let ret_bytes = call_api("import_json", param.clone()).unwrap();
+        let wallet_ret: KeystoreResult = KeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+
+        let ret_bytes = call_api("exists_json", param.clone()).unwrap();
+        let exists_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(exists_result.is_exists);
+
+        let derivation = Derivation {
+            chain_type: "KUSAMA".to_string(),
+            path: "".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "sr25519".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let param = DeriveAccountsParam {
+            id: wallet_ret.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let accounts: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(
+            accounts.accounts[0].address,
+            "FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8"
+        );
+
+        let export_param = ExportPrivateKeyParam {
+            id: wallet_ret.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "KUSAMA".to_string(),
+            network: "".to_string(),
+            curve: "sr25519".to_string(),
+            path: "".to_string(),
+        };
+        let ret = call_api("export_json", export_param).unwrap();
+        let keystore_ret: ExportJsonResult = ExportJsonResult::decode(ret.as_slice()).unwrap();
+
+        let keystore: SubstrateKeystore = serde_json::from_str(&keystore_ret.json).unwrap();
+        assert!(keystore.validate().is_ok());
+        assert_eq!(
+            keystore.address,
+            "FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8"
+        );
+        assert_eq!(keystore.meta.name, "test account");
+        assert!(keystore.meta.when_created > 1594102917);
+
+        // assert_eq!(keystore_ret.fixtures, "");
+        remove_created_wallet(&wallet_ret.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_multi_curve() {
+    run_test(|| {
+        let keystore_str: &str = r#"{
+                "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+                "encoded": "0xf7e7e89d3016c9b4d93bb1129adf69e5949ca1fb58c29da4591ddc72c52238a35835e3f2ae023f9867ff301bc4132463527ac03525eaac54664a7cb658eae68a0bbc99354222c194d6100b2bf3a492639229077a2e2818d8196e002f0b5556104be23b11633858259dbbd3f91ea1d34d6ce182b62d8381af1ef3c35e9ab1583267cfa41aa58bfd64435c2b5047baf9052f0953d9f7854d2d396dfcad13",
+                "encoding": {
+                    "content": [
+                    "pkcs8",
+                    "sr25519"
+                    ],
+                    "type": "xsalsa20-poly1305",
+                    "version": "2"
+                },
+                "meta": {
+                    "genesisHash": "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
+                    "name": "keystore_import",
+                    "tags": [],
+                    "whenCreated": 1593591324334
+                }
+            }"#;
+
+        let param = ImportJsonParam {
+            json: keystore_str.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            overwrite: true,
+        };
+
+        let ret_bytes = call_api("import_json", param).unwrap();
+        let wallet_ret: KeystoreResult = KeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        let derivation = Derivation {
+            chain_type: "KUSAMA".to_string(),
+            path: "".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let param = DeriveAccountsParam {
+            id: wallet_ret.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let accounts: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(
+            accounts.accounts[0].address,
+            "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS"
+        );
+
+        let derivation = Derivation {
+            chain_type: "LITECOIN".to_string(),
+            path: "".to_string(),
+            network: "MAINNET".to_string(),
+            seg_wit: "NONE".to_string(),
+            chain_id: "".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let param = DeriveAccountsParam {
+            id: wallet_ret.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param);
+        assert!(ret.is_err());
+        assert_eq!(
+            format!("{}", ret.err().unwrap()),
+            "private_key_curve_not_match"
+        );
+
+        remove_created_wallet(&wallet_ret.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_hex_private_key() {
+    run_test(|| {
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+            private_key: TEST_PRIVATE_KEY.to_string(),
+        };
+        let ret = call_api("exists_private_key", param).unwrap();
+        let exists_private_key_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret.as_slice()).unwrap();
+        assert!(!exists_private_key_result.is_exists);
+
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: TEST_PRIVATE_KEY.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "import_private_key_wallet".to_string(),
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_private_key", param).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            vec![
+                "BITCOIN".to_string(),
+                "ETHEREUM".to_string(),
+                "BITCOINCASH".to_string(),
+                "LITECOIN".to_string(),
+                "EOS".to_string(),
+                "TRON".to_string(),
+                "FILECOIN".to_string(),
+            ],
+            import_result.identified_chain_types
+        );
+        assert_eq!("secp256k1", import_result.identified_curve);
+        assert_eq!("", import_result.identified_network);
+        assert_eq!("PRIVATE", import_result.source);
+
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+            private_key: TEST_PRIVATE_KEY.to_string(),
+        };
+        let ret = call_api("exists_private_key", param).unwrap();
+        let exists_private_key_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret.as_slice()).unwrap();
+        assert!(exists_private_key_result.is_exists);
+        assert_eq!(exists_private_key_result.id, import_result.id);
+
+        let param: ExportPrivateKeyParam = ExportPrivateKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::export_private_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            chain_type: "ETHEREUM".to_string(),
+            network: "".to_string(),
+            curve: CurveType::SECP256k1.as_str().to_string(),
+            path: "".to_string(),
+        };
+        let ret = call_api("export_private_key", param).unwrap();
+        let export_result: ExportPrivateKeyResult =
+            ExportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(export_result.id, import_result.id);
+        assert_eq!(export_result.private_key, TEST_PRIVATE_KEY);
+
+        let param: ExportJsonParam = ExportJsonParam {
+            id: import_result.id.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            path: "".to_string(),
+        };
+        let ret = call_api("export_json", param).unwrap();
+        let export_result: ExportJsonResult = ExportJsonResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(export_result.id, import_result.id);
+        assert!(export_result
+            .json
+            .contains("6031564e7b2f5cc33737807b2e58daff870b590b"));
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_wif_network_mismatch() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: TEST_WIF.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "import_private_key_wallet".to_string(),
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_private_key", param);
+        assert_eq!(
+            format!("{}", ret.unwrap_err()),
+            "private_key_network_mismatch"
+        );
+
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: TEST_WIF.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "import_private_key_wallet".to_string(),
+            password_hint: "".to_string(),
+            network: "MAINNET".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_private_key", param);
+        // let import_result: ImportPrivateKeyResult =
+        //     ImportPrivateKeyResult::decode(ret.as_slice());
+        assert_eq!(
+            format!("{}", ret.unwrap_err()),
+            "private_key_network_mismatch"
+        );
+
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: TEST_WIF.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "import_private_key_wallet".to_string(),
+            password_hint: "".to_string(),
+            network: "TESTNET".to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_private_key", param).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(import_result.identified_network, "TESTNET");
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_import_v3_keystore_json() {
+    run_test(|| {
+        let json = r#"{
+                "version": 3,
+                "id": "5c24e96a-8fd8-4872-9702-3fd2fc9166cd",
+                "crypto": {
+                  "cipher": "aes-128-ctr",
+                  "cipherparams": { "iv": "56ed1daad9226d7edd75e8ab34e32309" },
+                  "ciphertext": "95cae71ef4d76c3def64bf77d267608a823fc65cda6254ea24d1cbbe09de6b6b",
+                  "kdf": "pbkdf2",
+                  "kdfparams": {
+                    "c": 262144,
+                    "prf": "hmac-sha256",
+                    "dklen": 32,
+                    "salt": "63c89a7275a65bd659a937fe374c668e5aa3b05a9b0ef3ec9178aa9182f42666"
+                  },
+                  "mac": "2adc6da2f5f183e528a063b36ebeddaf0d3a90269ef797b99dc143d58ba3bb58"
+                },
+                "address": "6031564e7b2f5cc33737807b2e58daff870b590b"
+              }
+              "#;
+        let param: ExistsJsonParam = ExistsJsonParam {
+            json: json.to_string(),
+            password: TEST_PASSWORD.to_string(),
+        };
+        let ret = call_api("exists_json", param).unwrap();
+        let exists_private_key_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret.as_slice()).unwrap();
+        assert!(!exists_private_key_result.is_exists);
+
+        let param: ImportJsonParam = ImportJsonParam {
+            password: TEST_PASSWORD.to_string(),
+            json: json.to_string(),
+            overwrite: true,
+        };
+        let ret = call_api("import_json", param).unwrap();
+        let import_result: ImportPrivateKeyResult =
+            ImportPrivateKeyResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            vec!["ETHEREUM".to_string()],
+            import_result.identified_chain_types
+        );
+        assert_eq!("secp256k1", import_result.identified_curve);
+        assert_eq!("", import_result.identified_network);
+        assert_eq!("KEYSTORE_V3", import_result.source);
+
+        let param: ExistsJsonParam = ExistsJsonParam {
+            password: TEST_PASSWORD.to_string(),
+            json: json.to_string(),
+        };
+        let ret = call_api("exists_json", param).unwrap();
+        let exists_private_key_result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret.as_slice()).unwrap();
+        assert!(exists_private_key_result.is_exists);
+        assert_eq!(exists_private_key_result.id, import_result.id);
+
+        let param: ExportJsonParam = ExportJsonParam {
+            id: import_result.id.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            path: "".to_string(),
+        };
+        let ret = call_api("export_json", param).unwrap();
+        let export_result: ExportJsonResult = ExportJsonResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(export_result.id, import_result.id);
+        assert!(export_result
+            .json
+            .to_string()
+            .contains("6031564e7b2f5cc33737807b2e58daff870b590b"));
+    })
+}
diff --git a/token-core/tcx/tests/integration_test.rs b/token-core/tcx/tests/integration_test.rs
new file mode 100644
index 00000000..da1c360a
--- /dev/null
+++ b/token-core/tcx/tests/integration_test.rs
@@ -0,0 +1,42 @@
+use common::run_test;
+use serial_test::serial;
+use tcx::api::TcxAction;
+
+mod common;
+
+use std::ffi::CString;
+
+use tcx::*;
+
+use tcx_common::ToHex;
+
+use prost::Message;
+use tcx::api::SignParam;
+
+use sp_core::ByteArray;
+
+use tcx_btc_kin::OmniTxInput;
+
+use tcx_common::hex::FromHex;
+
+use crate::common::import_default_wallet;
+
+#[test]
+#[serial]
+#[ignore = "for debug"]
+fn test_call_tcx_api() {
+    run_test(|| {
+        let bytes = &Vec::<u8>::from_hex_auto("0a077369676e5f747812c6020a0d6170692e5369676e506172616d12b4020a2431613663643861642d376265392d343762622d613533642d306463363962366134643966120b71713330373939303538382207424954434f494e2a0f6d2f3439272f30272f30272f302f303209736563703235366b313a074d41494e4e45544206503257504b484ac8010a197472616e73616374696f6e2e4274634b696e5478496e70757412aa010a7d0a4066646461616535663763346565323135343135333361636163653934376162363464626434663061383932353864613763333636643339343064373663383661100018e38a032222334d465a673136634b79547047527054547947746a4e594c63337a734a78764a61352a0f6d2f3439272f30272f30272f302f3012223351657271594e5143644854357a504545314a3532673354376d5971714e7362503618c0843d208b1f").unwrap();
+        let action = TcxAction::decode(bytes.as_slice()).unwrap();
+        dbg!(&action);
+        let param = SignParam::decode(action.param.unwrap().value.as_slice()).unwrap();
+        let input = OmniTxInput::decode(param.input.unwrap().value.as_slice()).unwrap();
+
+        let _wallet = import_default_wallet();
+        dbg!(&input);
+        unsafe {
+            call_tcx_api(CString::new(bytes.to_hex()).unwrap().as_ptr());
+        }
+        assert!(true);
+    });
+}
diff --git a/token-core/tcx/tests/migration_test.rs b/token-core/tcx/tests/migration_test.rs
new file mode 100644
index 00000000..98307461
--- /dev/null
+++ b/token-core/tcx/tests/migration_test.rs
@@ -0,0 +1,1083 @@
+use libc::id_t;
+use serial_test::serial;
+
+mod common;
+use api::sign_param::Key;
+
+use tcx::filemanager::{KEYSTORE_MAP, LEGACY_WALLET_FILE_DIR};
+
+use tcx::*;
+use tcx_atom::transaction::{AtomTxInput, AtomTxOutput};
+
+use prost::Message;
+use tcx::api::{
+    export_mnemonic_param, migrate_keystore_param, wallet_key_param, BackupResult,
+    ExportMnemonicParam, ExportMnemonicResult, GeneralResult, MarkIdentityWalletsParam,
+    MigrateKeystoreParam, MigrateKeystoreResult, ReadKeystoreMnemonicPathResult, SignParam,
+    WalletId, WalletKeyParam,
+};
+
+use tcx::handler::encode_message;
+use tcx_constants::CurveType;
+use tcx_constants::{OTHER_MNEMONIC, TEST_PASSWORD};
+use tcx_keystore::Keystore;
+
+use anyhow::{anyhow, format_err};
+use std::path::Path;
+use std::{fs, io};
+
+use sp_core::ByteArray;
+
+use crate::common::*;
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_existed() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    let keystore = result.keystore.unwrap();
+    assert_eq!(keystore.id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+    assert_eq!(
+        keystore.identifier,
+        "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg"
+    );
+    assert_eq!(
+        keystore.ipfs_id,
+        "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU"
+    );
+    assert_eq!(keystore.created_at, 1703213098);
+    assert_eq!(keystore.source, "MNEMONIC");
+    assert_eq!(keystore.name, "tcx-wallet");
+    assert_eq!(
+        keystore.source_fingerprint,
+        "0x1468dba9c246fe22183c056540ab4d8b04553217"
+    );
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "00fc0804-7cea-46d8-9e95-ed1efac65358".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "2d7380db28736ae5b0693340a5731e137759d32bbcc1f7988574bc5a1ffd97f3411b4edc14ea648fa17d511129e81a84d2b8a00d45bc37f4784e49b641d5c3be".to_string(),
+            )),
+        };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert!(result.is_existed);
+    assert_eq!(result.existed_id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_multi_times() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    let keystore = result.keystore.unwrap();
+    assert_eq!(keystore.id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+    assert_eq!(
+        keystore.identifier,
+        "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg"
+    );
+    assert_eq!(
+        keystore.ipfs_id,
+        "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU"
+    );
+    assert_eq!(keystore.created_at, 1703213098);
+    assert_eq!(keystore.source, "MNEMONIC");
+    assert_eq!(keystore.name, "tcx-wallet");
+    assert_eq!(
+        keystore.source_fingerprint,
+        "0x1468dba9c246fe22183c056540ab4d8b04553217"
+    );
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "00fc0804-7cea-46d8-9e95-ed1efac65358".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "2d7380db28736ae5b0693340a5731e137759d32bbcc1f7988574bc5a1ffd97f3411b4edc14ea648fa17d511129e81a84d2b8a00d45bc37f4784e49b641d5c3be".to_string(),
+            )),
+        };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert!(result.is_existed);
+    assert_eq!(result.existed_id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "1bfddca9-84dc-4561-bbe9-844a9ff2b281".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::DerivedKey(
+            "2d7380db28736ae5b0693340a5731e137759d32bbcc1f7988574bc5a1ffd97f3411b4edc14ea648fa17d511129e81a84d2b8a00d45bc37f4784e49b641d5c3be".to_string(),
+        )),
+    };
+
+    for _ in 1..100 {
+        let ret = call_api("migrate_keystore", param.clone()).unwrap();
+        let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+        assert!(result.is_existed);
+        assert_eq!(result.existed_id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+    }
+
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_existed_mainnet() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(),
+        network: "MAINNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    let keystore = result.keystore.unwrap();
+    assert_eq!(keystore.id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+    assert_eq!(
+        keystore.identifier,
+        "im14x5GXsdME4JsrHYe2wvznqRz4cUhx2pA4HPf"
+    );
+    assert_eq!(
+        keystore.ipfs_id,
+        "QmWqwovhrZBMmo32BzY83ZMEBQaP7YRMqXNmMc8mgrpzs6"
+    );
+    assert_eq!(keystore.created_at, 1703213098);
+    assert_eq!(keystore.source, "MNEMONIC");
+    assert_eq!(keystore.name, "tcx-wallet");
+    assert_eq!(
+        keystore.source_fingerprint,
+        "0x1468dba9c246fe22183c056540ab4d8b04553217"
+    );
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "00fc0804-7cea-46d8-9e95-ed1efac65358".to_string(),
+        network: "MAINNET".to_string(),
+        key: Some(migrate_keystore_param::Key::DerivedKey(
+            "2d7380db28736ae5b0693340a5731e137759d32bbcc1f7988574bc5a1ffd97f3411b4edc14ea648fa17d511129e81a84d2b8a00d45bc37f4784e49b641d5c3be".to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert!(result.is_existed);
+    assert_eq!(result.existed_id, "0a2756cd-ff70-437b-9bdb-ad46b8bb0819");
+
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_source() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017".to_string(),
+            )),
+        };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert_eq!(result.keystore.unwrap().source, "PRIVATE");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "6c3eae60-ad03-48db-a5e5-61a6f72aef8d".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "9f65c31b4a61c430cd6c976e7f1b1b912bb09b46ec718447bbb5dccc353b19becb6b386405b3fcc7d43bd8e617764c3407d45824e52984d0074ac3f75c68bd92".to_string()
+            )),
+        };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert_eq!(result.keystore.unwrap().source, "MNEMONIC");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "9f4acb4a-7431-4c7d-bd25-a19656a86ea0".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "a5b0cb9cb0536d6ec6ab21da77415bd59aff62c44c1da40d377c4faf2a44608693a72efb4079f57a5dca710ecff75dc5b54beb4ad6d9f9d47b63583810b50c61".to_string(),
+            )),
+        };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert_eq!(result.keystore.unwrap().source, "WIF");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "949bada8-776c-4554-ad0c-001e3726a0f8".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert_eq!(result.keystore.unwrap().source, "SUBSTRATE_KEYSTORE");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "60573d8d-8e83-45c3-85a5-34fbb2aad5e1".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert_eq!(result.keystore.unwrap().source, "KEYSTORE_V3");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    assert_eq!(result.keystore.unwrap().source, "PRIVATE");
+
+    // fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_curve() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017".to_string(),
+            )),
+        };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    // let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::SECP256k1
+        );
+    }
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "9f4acb4a-7431-4c7d-bd25-a19656a86ea0".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "a5b0cb9cb0536d6ec6ab21da77415bd59aff62c44c1da40d377c4faf2a44608693a72efb4079f57a5dca710ecff75dc5b54beb4ad6d9f9d47b63583810b50c61".to_string(),
+            )),
+        };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("9f4acb4a-7431-4c7d-bd25-a19656a86ea0")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::SECP256k1
+        );
+    }
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "949bada8-776c-4554-ad0c-001e3726a0f8".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("949bada8-776c-4554-ad0c-001e3726a0f8")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::SR25519
+        );
+    }
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "60573d8d-8e83-45c3-85a5-34fbb2aad5e1".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("60573d8d-8e83-45c3-85a5-34fbb2aad5e1")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::SECP256k1
+        );
+    }
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::BLS
+        );
+    }
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::BLS
+        );
+    }
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "4d5cbfcf-aee1-4908-9991-9d060eb68a0e".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    {
+        let map = KEYSTORE_MAP.read();
+        assert_eq!(
+            map.get("4d5cbfcf-aee1-4908-9991-9d060eb68a0e")
+                .unwrap()
+                .get_curve()
+                .unwrap(),
+            CurveType::ED25519
+        );
+    }
+
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_flush() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017".to_string(),
+            )),
+        };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    // let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json"
+    ))
+    .unwrap();
+    let mut keystore = Keystore::from_json(&json).unwrap();
+    assert_eq!(
+        keystore.fingerprint(),
+        "0x8b650646c72d8ec3f2a6da9f76dfe624a862c578"
+    );
+
+    keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+    assert_eq!(
+        keystore.export().unwrap(),
+        "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171"
+    );
+
+    assert_eq!(keystore.get_curve().unwrap(), CurveType::SECP256k1);
+    assert_eq!(keystore.id(), "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca");
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_flush_mainnet() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca".to_string(),
+        network: "MAINNET".to_string(),
+        key: Some(migrate_keystore_param::Key::DerivedKey(
+            "1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017".to_string(),
+        )),
+    };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    // let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json"
+    ))
+    .unwrap();
+    let mut keystore = Keystore::from_json(&json).unwrap();
+    assert_eq!(
+        keystore.fingerprint(),
+        "0x8b650646c72d8ec3f2a6da9f76dfe624a862c578"
+    );
+
+    keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+    assert_eq!(
+        keystore.export().unwrap(),
+        "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171"
+    );
+
+    assert_eq!(keystore.get_curve().unwrap(), CurveType::SECP256k1);
+    assert_eq!(keystore.id(), "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca");
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_identified_network_flush() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "1a60471067b6c6a3202e0014de2ce9b2d45fd73e2289b3cc3d8e5b58fe99ff242fd61e9fe63e75abbdc0ed87a50756cc10c57daf1d6297b99ec9a3b174eee017".to_string(),
+            )),
+        };
+    let _ = call_api("migrate_keystore", param).unwrap();
+    // let result: MigrateKeystoreResult = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json"
+    ))
+    .unwrap();
+    let mut keystore = Keystore::from_json(&json).unwrap();
+    assert_eq!(
+        keystore.fingerprint(),
+        "0x8b650646c72d8ec3f2a6da9f76dfe624a862c578"
+    );
+
+    keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+    assert_eq!(
+        keystore.export().unwrap(),
+        "685634d212eabe016a1cb09d9f1ea1ea757ebe590b9a097d7b1c9379ad280171"
+    );
+
+    assert_eq!(keystore.get_curve().unwrap(), CurveType::SECP256k1);
+    assert_eq!(keystore.id(), "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca");
+    fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_identified_chain_types() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    // original = wif, identified_chain_types = BITCOIN
+    {
+        let param: MigrateKeystoreParam = MigrateKeystoreParam {
+                id: "d9e3bb9c-87fd-4836-b146-10a3e249eb75".to_string(),
+                network: "TESTNET".to_string(),
+                key: Some(migrate_keystore_param::Key::DerivedKey(
+                    "01073f22079380d2180300c518f6b510d4761fd83ce738271460c9e745b9055dabb28f93ff3a8fd54e0c71c005b5e799f8d52bcce1a81e08b5f15f9604531574".to_string(),
+                )),
+            };
+        call_api("migrate_keystore", param).unwrap();
+        let json = fs::read_to_string(format!(
+            "../test-data/walletsV2/d9e3bb9c-87fd-4836-b146-10a3e249eb75.json"
+        ))
+        .unwrap();
+        let keystore = Keystore::from_json(&json).unwrap();
+        assert_eq!(
+            keystore.meta().identified_chain_types,
+            Some(vec!["BITCOIN".to_string()])
+        );
+        let unlocker = keystore
+                .store()
+                .crypto
+                .use_key(&tcx_crypto::Key::DerivedKey("01073f22079380d2180300c518f6b510d4761fd83ce738271460c9e745b9055dabb28f93ff3a8fd54e0c71c005b5e799f8d52bcce1a81e08b5f15f9604531574".to_string()))
+                .unwrap();
+        let wif_bytes = unlocker
+            .decrypt_enc_pair(&keystore.store().enc_original)
+            .unwrap();
+        let wif = String::from_utf8_lossy(&wif_bytes);
+        assert_eq!("L1xDTJYPqhofU8DQCiwjStEBr1X6dhiNfweUhxhoRSgYyMJPcZ6B", wif);
+    }
+
+    // original = hex, identified_chain_types = ETEHREUM
+    {
+        let param: MigrateKeystoreParam = MigrateKeystoreParam {
+                id: "60573d8d-8e83-45c3-85a5-34fbb2aad5e1".to_string(),
+                network: "TESTNET".to_string(),
+                key: Some(migrate_keystore_param::Key::DerivedKey(
+                    "8f2316895af6d58b5b75d424977cdaeae2a619c6b941ca5f77dcfed592cd3b23b698040caf397df6153db6f2d5b2815bf8f8cd32f99998ca46534242df82d1ca".to_string(),
+                )),
+            };
+        call_api("migrate_keystore", param).unwrap();
+        let json = fs::read_to_string(format!(
+            "../test-data/walletsV2/60573d8d-8e83-45c3-85a5-34fbb2aad5e1.json"
+        ))
+        .unwrap();
+        let keystore = Keystore::from_json(&json).unwrap();
+        assert_eq!(
+            keystore.meta().identified_chain_types,
+            Some(vec!["ETHEREUM".to_string()])
+        );
+
+        let unlocker = keystore
+                .store()
+                .crypto
+                .use_key(&tcx_crypto::Key::DerivedKey("8f2316895af6d58b5b75d424977cdaeae2a619c6b941ca5f77dcfed592cd3b23b698040caf397df6153db6f2d5b2815bf8f8cd32f99998ca46534242df82d1ca".to_string()))
+                .unwrap();
+        let decrypted = unlocker
+            .decrypt_enc_pair(&keystore.store().enc_original)
+            .unwrap();
+        let json = String::from_utf8_lossy(&decrypted);
+        assert!(json.contains("9b62a4c07c96ca9b0b82b5b5eae4e7c9b2b7db531a6d2991198eb6809a8c35ac"));
+    }
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "792a0051-16d7-44a7-921a-9b4a0c893b8f".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "0xebe2739dd04525823b967b914a74a5dedd0086622d0da3449c1354199518673dd33fca8f6bd64870d6e6dc28b0f6e9de169243679b1668750f23cfe9523c03b3".to_string(),
+            )),
+        };
+    call_api("migrate_keystore", param).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/792a0051-16d7-44a7-921a-9b4a0c893b8f.json"
+    ))
+    .unwrap();
+    let keystore = Keystore::from_json(&json).unwrap();
+    assert!(keystore.meta().identified_chain_types.is_none());
+
+    // assert!(keystore.store().enc_original.is_none());
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "f3615a56-cb03-4aa4-a893-89944e49920d".to_string(),
+            network: "TESTNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "0x79c74b67fc73a255bc66afc1e7c25867a19e6d2afa5b8e3107a472de13201f1924fed05e811e7f5a4c3e72a8a6e047a80393c215412bde239ec7ded520896630".to_string(),
+            )),
+        };
+    call_api("migrate_keystore", param).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/f3615a56-cb03-4aa4-a893-89944e49920d.json"
+    ))
+    .unwrap();
+    let keystore = Keystore::from_json(&json).unwrap();
+    assert_eq!(
+        keystore.meta().identified_chain_types,
+        Some(vec!["ETHEREUM".to_string()])
+    );
+
+    let unlocker = keystore
+            .store()
+            .crypto
+            .use_key(&tcx_crypto::Key::DerivedKey("0x79c74b67fc73a255bc66afc1e7c25867a19e6d2afa5b8e3107a472de13201f1924fed05e811e7f5a4c3e72a8a6e047a80393c215412bde239ec7ded520896630".to_string()))
+            .unwrap();
+    let decrypted = unlocker
+        .decrypt_enc_pair(&keystore.store().enc_original)
+        .unwrap();
+    let hex = String::from_utf8_lossy(&decrypted);
+    assert_eq!(
+        "4b8e7a47497d810cd11f209b8ce9d3b0eec34e85dc8bad5d12cb602425dd3d6b",
+        hex
+    );
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json"
+    ))
+    .unwrap();
+    let keystore = Keystore::from_json(&json).unwrap();
+    assert_eq!(
+        keystore.meta().identified_chain_types,
+        Some(vec!["FILECOIN".to_string()])
+    );
+    // assert!(keystore.store().enc_original.is_none());
+
+    // fs::remove_dir_all("../test-data/walletsV2").unwrap();
+}
+
+#[test]
+#[serial]
+pub fn test_migrate_keystores_identified_chain_types_mainnet() {
+    let _ = fs::remove_dir_all("../test-data/walletsV2");
+    init_token_core_x("../test-data");
+
+    // original = wif, identified_chain_types = BITCOIN
+    {
+        let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "d9e3bb9c-87fd-4836-b146-10a3e249eb75".to_string(),
+            network: "MAINNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "01073f22079380d2180300c518f6b510d4761fd83ce738271460c9e745b9055dabb28f93ff3a8fd54e0c71c005b5e799f8d52bcce1a81e08b5f15f9604531574".to_string(),
+            )),
+        };
+        call_api("migrate_keystore", param).unwrap();
+        let json = fs::read_to_string(format!(
+            "../test-data/walletsV2/d9e3bb9c-87fd-4836-b146-10a3e249eb75.json"
+        ))
+        .unwrap();
+        let keystore = Keystore::from_json(&json).unwrap();
+        let unlocker = keystore
+            .store()
+            .crypto
+            .use_key(&tcx_crypto::Key::DerivedKey("01073f22079380d2180300c518f6b510d4761fd83ce738271460c9e745b9055dabb28f93ff3a8fd54e0c71c005b5e799f8d52bcce1a81e08b5f15f9604531574".to_string()))
+            .unwrap();
+        let wif_bytes = unlocker
+            .decrypt_enc_pair(&keystore.store().enc_original)
+            .unwrap();
+        let wif = String::from_utf8_lossy(&wif_bytes);
+        assert_eq!("L1xDTJYPqhofU8DQCiwjStEBr1X6dhiNfweUhxhoRSgYyMJPcZ6B", wif);
+    }
+
+    // original = hex, identified_chain_types = ETEHREUM
+    {
+        let param: MigrateKeystoreParam = MigrateKeystoreParam {
+            id: "60573d8d-8e83-45c3-85a5-34fbb2aad5e1".to_string(),
+            network: "MAINNET".to_string(),
+            key: Some(migrate_keystore_param::Key::DerivedKey(
+                "8f2316895af6d58b5b75d424977cdaeae2a619c6b941ca5f77dcfed592cd3b23b698040caf397df6153db6f2d5b2815bf8f8cd32f99998ca46534242df82d1ca".to_string(),
+            )),
+        };
+        call_api("migrate_keystore", param).unwrap();
+        let json = fs::read_to_string(format!(
+            "../test-data/walletsV2/60573d8d-8e83-45c3-85a5-34fbb2aad5e1.json"
+        ))
+        .unwrap();
+        let keystore = Keystore::from_json(&json).unwrap();
+        let unlocker = keystore
+            .store()
+            .crypto
+            .use_key(&tcx_crypto::Key::DerivedKey("8f2316895af6d58b5b75d424977cdaeae2a619c6b941ca5f77dcfed592cd3b23b698040caf397df6153db6f2d5b2815bf8f8cd32f99998ca46534242df82d1ca".to_string()))
+            .unwrap();
+        let decrypted = unlocker
+            .decrypt_enc_pair(&keystore.store().enc_original)
+            .unwrap();
+        let json = String::from_utf8_lossy(&decrypted);
+        assert!(json.contains("9b62a4c07c96ca9b0b82b5b5eae4e7c9b2b7db531a6d2991198eb6809a8c35ac"));
+    }
+
+    let param: MigrateKeystoreParam = MigrateKeystoreParam {
+        id: "f3615a56-cb03-4aa4-a893-89944e49920d".to_string(),
+        network: "MAINNET".to_string(),
+        key: Some(migrate_keystore_param::Key::DerivedKey(
+            "0x79c74b67fc73a255bc66afc1e7c25867a19e6d2afa5b8e3107a472de13201f1924fed05e811e7f5a4c3e72a8a6e047a80393c215412bde239ec7ded520896630".to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let json = fs::read_to_string(format!(
+        "../test-data/walletsV2/f3615a56-cb03-4aa4-a893-89944e49920d.json"
+    ))
+    .unwrap();
+    let keystore = Keystore::from_json(&json).unwrap();
+    let unlocker = keystore
+        .store()
+        .crypto
+        .use_key(&tcx_crypto::Key::DerivedKey("0x79c74b67fc73a255bc66afc1e7c25867a19e6d2afa5b8e3107a472de13201f1924fed05e811e7f5a4c3e72a8a6e047a80393c215412bde239ec7ded520896630".to_string()))
+        .unwrap();
+    let decrypted = unlocker
+        .decrypt_enc_pair(&keystore.store().enc_original)
+        .unwrap();
+    let hex = String::from_utf8_lossy(&decrypted);
+    assert_eq!(
+        "4b8e7a47497d810cd11f209b8ce9d3b0eec34e85dc8bad5d12cb602425dd3d6b",
+        hex
+    );
+}
+
+fn copy_dir(src: &Path, dst: &Path) -> Result<()> {
+    if src.is_dir() {
+        fs::create_dir_all(dst)?; // Create destination directory if it doesn't exist
+        for entry in src.read_dir()? {
+            let entry = entry?;
+            let path = entry.path();
+            let new_dest = dst.join(path.strip_prefix(src)?);
+            if path.is_dir() {
+                copy_dir(&path, &new_dest)?; // Recursively copy subdirectories
+            } else {
+                fs::copy(&path, &new_dest)?; // Copy files
+            }
+        }
+    } else {
+        return Err(anyhow!("source is not a directory"));
+    }
+    Ok(())
+}
+
+fn setup_test(old_wallet_dir: &str) {
+    let _ = fs::remove_dir_all("/tmp/token-core-x");
+    copy_dir(&Path::new(old_wallet_dir), &Path::new("/tmp/token-core-x")).unwrap();
+
+    init_token_core_x("/tmp/token-core-x");
+}
+
+#[test]
+#[serial]
+fn test_migrate_duplicate_then_delete_keystore() {
+    setup_test("../test-data/migrate-duplication-fixtures");
+    let param = MigrateKeystoreParam {
+        id: "300b42bc-0948-4734-82cb-4293dfeeefd2".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = ExportMnemonicParam {
+        id: "300b42bc-0948-4734-82cb-4293dfeeefd2".to_string(),
+        key: Some(export_mnemonic_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("export_mnemonic", param).unwrap();
+    let exported = ExportMnemonicResult::decode(ret.as_slice())
+        .unwrap()
+        .mnemonic;
+    assert_eq!(OTHER_MNEMONIC, exported);
+    // CKB imported 300b42bc-0948-4734-82cb-4293dfeeefd2
+    // 9b696367-69c1-4cfe-8325-e5530399fc3f
+    let param = MigrateKeystoreParam {
+        id: "9b696367-69c1-4cfe-8325-e5530399fc3f".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = ExportMnemonicParam {
+        id: "9b696367-69c1-4cfe-8325-e5530399fc3f".to_string(),
+        key: Some(export_mnemonic_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("export_mnemonic", param).unwrap();
+    let exported = ExportMnemonicResult::decode(ret.as_slice())
+        .unwrap()
+        .mnemonic;
+    assert_eq!(OTHER_MNEMONIC, exported);
+
+    let raw_data = "0a91010a8e010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126e0a2d636f736d6f733175616d6e346b74706d657332656664663671666837386d356365646b66637467617436657661122d636f736d6f73316a30636c726371727a636135326c6167707a3237687774713734776c327265353438346177681a0e0a057561746f6d1205313030303012680a510a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210232c1ef21d73c19531b0aa4e863cf397c2b982b2f958f60cdb62969824c096d6512040a02080118930312130a0d0a057561746f6d12043230303410b1f2041a0b636f736d6f736875622d34208cb201".to_string();
+    let input = AtomTxInput { raw_data };
+    let input_value = encode_message(input).unwrap();
+
+    let tx = SignParam {
+        id: "9b696367-69c1-4cfe-8325-e5530399fc3f".to_string(),
+        key: Some(Key::Password(TEST_PASSWORD.to_string())),
+        chain_type: "COSMOS".to_string(),
+        path: "m/44'/118'/0'/0/0".to_string(),
+        curve: "secp256k1".to_string(),
+        network: "".to_string(),
+        seg_wit: "".to_string(),
+        input: Some(::prost_types::Any {
+            type_url: "imtoken".to_string(),
+            value: input_value,
+        }),
+    };
+
+    let ret = call_api("sign_tx", tx).unwrap();
+    let output: AtomTxOutput = AtomTxOutput::decode(ret.as_slice()).unwrap();
+    let expected_sig =
+        "3/FXveMRWVXcdJRSaz1hBbEReka2/vXqAoHlj1L1jl9y0worNAjEqo3Y9CWx8ddl9qKwghWBRQ70mJDNsXnoJQ==";
+    assert_eq!(expected_sig, output.signature);
+
+    let param = WalletKeyParam {
+        id: "300b42bc-0948-4734-82cb-4293dfeeefd2".to_string(),
+        key: Some(wallet_key_param::Key::Password(TEST_PASSWORD.to_string())),
+    };
+    let ret = call_api("delete_keystore", param).unwrap();
+
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/_migrated").exists(),
+        false
+    );
+}
+
+#[test]
+#[serial]
+fn test_migrate_duplicate_delete_all_keystore_migrate_again() {
+    setup_test("../test-data/migrate-duplication-fixtures");
+    let param = MigrateKeystoreParam {
+        id: "300b42bc-0948-4734-82cb-4293dfeeefd2".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = ExportMnemonicParam {
+        id: "300b42bc-0948-4734-82cb-4293dfeeefd2".to_string(),
+        key: Some(export_mnemonic_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("export_mnemonic", param).unwrap();
+    let exported = ExportMnemonicResult::decode(ret.as_slice())
+        .unwrap()
+        .mnemonic;
+    assert_eq!(OTHER_MNEMONIC, exported);
+    // CKB imported 300b42bc-0948-4734-82cb-4293dfeeefd2
+    // 9b696367-69c1-4cfe-8325-e5530399fc3f
+    let param = MigrateKeystoreParam {
+        id: "9b696367-69c1-4cfe-8325-e5530399fc3f".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = ExportMnemonicParam {
+        id: "9b696367-69c1-4cfe-8325-e5530399fc3f".to_string(),
+        key: Some(export_mnemonic_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("export_mnemonic", param).unwrap();
+    let exported = ExportMnemonicResult::decode(ret.as_slice())
+        .unwrap()
+        .mnemonic;
+    assert_eq!(OTHER_MNEMONIC, exported);
+
+    let param = WalletKeyParam {
+        id: "300b42bc-0948-4734-82cb-4293dfeeefd2".to_string(),
+        key: Some(wallet_key_param::Key::Password(TEST_PASSWORD.to_string())),
+    };
+    let ret = call_api("delete_keystore", param).unwrap();
+
+    let param = MigrateKeystoreParam {
+        id: "792a0051-16d7-44a7-921a-9b4a0c893b8f".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = ExportMnemonicParam {
+        id: "792a0051-16d7-44a7-921a-9b4a0c893b8f".to_string(),
+        key: Some(export_mnemonic_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("export_mnemonic", param).unwrap();
+    let exported = ExportMnemonicResult::decode(ret.as_slice())
+        .unwrap()
+        .mnemonic;
+    assert_eq!(OTHER_MNEMONIC, exported);
+
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/_migrated").exists(),
+        false
+    );
+
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f").exists(),
+        true
+    );
+}
+
+#[test]
+#[serial]
+fn test_migrate_android_old_eos_private_keystore() {
+    setup_test("../test-data");
+    let param = MigrateKeystoreParam {
+        id: "0d49aae6-cf73-4ebb-998d-b6312d18361f".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            "11111111".to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = WalletKeyParam {
+        id: "0d49aae6-cf73-4ebb-998d-b6312d18361f".to_string(),
+        key: Some(wallet_key_param::Key::Password("11111111".to_string())),
+    };
+    let ret = call_api("backup", param).unwrap();
+    let exported = BackupResult::decode(ret.as_slice()).unwrap().original;
+    assert_eq!(
+        "5KhJeeS5eVDv5DHsFnorDLiJkTeGtMKwmRgyHiVJYzYVd2d1BoP",
+        exported
+    );
+}
+
+#[test]
+#[serial]
+fn test_migrate_ios_old_eos_private_keystore() {
+    setup_test("../test-data");
+    let param = MigrateKeystoreParam {
+        id: "20a9f050-7fd1-4f2c-b7f8-f03c78201f78".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            "11111111".to_string(),
+        )),
+    };
+    call_api("migrate_keystore", param).unwrap();
+    let param = WalletKeyParam {
+        id: "20a9f050-7fd1-4f2c-b7f8-f03c78201f78".to_string(),
+        key: Some(wallet_key_param::Key::Password("11111111".to_string())),
+    };
+    let ret = call_api("backup", param).unwrap();
+    let exported = BackupResult::decode(ret.as_slice()).unwrap().original;
+    assert_eq!(
+        "5KhJeeS5eVDv5DHsFnorDLiJkTeGtMKwmRgyHiVJYzYVd2d1BoP",
+        exported
+    );
+}
+
+#[test]
+#[serial]
+fn test_delete_all_identity_wallets() {
+    setup_test("../test-data/identity-keystore-delete");
+    let param = MarkIdentityWalletsParam {
+        ids: vec![
+            "0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(),
+            "00fc0804-7cea-46d8-9e95-ed1efac65358".to_string(),
+            "6c3eae60-ad03-48db-a5e5-61a6f72aef8d".to_string(),
+        ],
+        source: "RECOVERED_IDENTITY".to_string(),
+    };
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json").exists(),
+        true
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358").exists(),
+        true
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d").exists(),
+        true
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/identity.json").exists(),
+        true
+    );
+    call_api("mark_identity_wallets", param).unwrap();
+
+    let param = MigrateKeystoreParam {
+        id: "0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(),
+        network: "TESTNET".to_string(),
+        key: Some(migrate_keystore_param::Key::Password(
+            TEST_PASSWORD.to_string(),
+        )),
+    };
+    let ret = call_api("migrate_keystore", param).unwrap();
+    let migrated_ks = MigrateKeystoreResult::decode(ret.as_slice()).unwrap();
+
+    let param = WalletKeyParam {
+        id: "0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(),
+        key: Some(wallet_key_param::Key::Password(TEST_PASSWORD.to_string())),
+    };
+    let ret = call_api("delete_keystore", param).unwrap();
+
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d").exists(),
+        false
+    );
+    assert_eq!(
+        Path::new("/tmp/token-core-x/wallets/identity.json").exists(),
+        false
+    );
+}
+
+#[test]
+#[serial]
+fn test_read_keystore_mnemonic_path() {
+    setup_test("../test-data/identity-keystore-delete");
+
+    let wallet_ids = vec![
+        ("0a2756cd-ff70-437b-9bdb-ad46b8bb0819".to_string(), ""),
+        (
+            "00fc0804-7cea-46d8-9e95-ed1efac65358".to_string(),
+            "m/49'/1'/0'",
+        ),
+        (
+            "6c3eae60-ad03-48db-a5e5-61a6f72aef8d".to_string(),
+            "m/44'/194'/0'/0/0",
+        ),
+    ];
+    for (id, path) in wallet_ids {
+        let param = WalletId { id };
+        let ret = call_api("read_keystore_mnemonic_path", param).unwrap();
+        let mnemonic_path = ReadKeystoreMnemonicPathResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(mnemonic_path.path, path);
+    }
+}
diff --git a/token-core/tcx/tests/other_test.rs b/token-core/tcx/tests/other_test.rs
new file mode 100644
index 00000000..4c1740f5
--- /dev/null
+++ b/token-core/tcx/tests/other_test.rs
@@ -0,0 +1,296 @@
+use std::fs;
+
+use common::run_test;
+use serial_test::serial;
+
+mod common;
+
+use tcx::*;
+
+use prost::Message;
+use tcx::api::{
+    DecryptDataFromIpfsParam, DecryptDataFromIpfsResult, DerivedKeyResult, EncryptDataToIpfsParam,
+    EncryptDataToIpfsResult, ExistsKeystoreResult, ExistsMnemonicParam, ExistsPrivateKeyParam,
+    GeneralResult, ImportPrivateKeyParam, KeystoreResult, SignAuthenticationMessageParam,
+    SignAuthenticationMessageResult, WalletKeyParam,
+};
+
+use tcx::handler::{encode_message, get_derived_key, import_private_key};
+
+use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
+
+use sp_core::ByteArray;
+
+use crate::common::*;
+
+#[test]
+#[serial]
+pub fn test_verify_password() {
+    run_test(|| {
+        let wallet_id = vec![
+            import_default_pk_store().id.to_string(),
+            import_default_wallet().id.to_string(),
+        ];
+        for id in wallet_id {
+            let param: WalletKeyParam = WalletKeyParam {
+                id: id.to_string(),
+                key: Some(api::wallet_key_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                )),
+            };
+
+            let ret_bytes = call_api("verify_password", param).unwrap();
+            let result: GeneralResult = GeneralResult::decode(ret_bytes.as_slice()).unwrap();
+            assert!(result.is_success);
+
+            let param: WalletKeyParam = WalletKeyParam {
+                id: id.to_string(),
+                key: Some(api::wallet_key_param::Key::Password(
+                    "WRONG PASSWORD".to_string(),
+                )),
+            };
+
+            let ret = call_api("verify_password", param);
+            assert!(ret.is_err());
+            assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
+        }
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_delete_keystore_by_password() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: "5JZc7wGRUr4J1RHDcM9ySWKLfQ2xjRUEo612qC4RLJ3G7jzJ4qx".to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "test_delete_keystore".to_string(),
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: true,
+        };
+
+        let ret_bytes = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        let param: WalletKeyParam = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                "WRONG PASSWORD".to_string(),
+            )),
+        };
+
+        let ret = call_api("delete_keystore", param);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
+
+        let param: WalletKeyParam = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+
+        let ret_bytes = call_api("delete_keystore", param).unwrap();
+        let ret: GeneralResult = GeneralResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(ret.is_success);
+
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+            private_key: "5JZc7wGRUr4J1RHDcM9ySWKLfQ2xjRUEo612qC4RLJ3G7jzJ4qx".to_string(),
+        };
+
+        let ret_bytes = call_api("exists_private_key", param).unwrap();
+        let ret: ExistsKeystoreResult = ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+
+        assert_eq!(false, ret.is_exists);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_delete_keystore_by_derived_key() {
+    run_test(|| {
+        let param: ImportPrivateKeyParam = ImportPrivateKeyParam {
+            private_key: "5JZc7wGRUr4J1RHDcM9ySWKLfQ2xjRUEo612qC4RLJ3G7jzJ4qx".to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "test_delete_keystore".to_string(),
+            password_hint: "".to_string(),
+            network: "".to_string(),
+            overwrite: true,
+        };
+
+        let ret_bytes = import_private_key(&encode_message(param).unwrap()).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret_bytes = get_derived_key(&encode_message(param).unwrap()).unwrap();
+        let derived_key_result: DerivedKeyResult =
+            DerivedKeyResult::decode(ret_bytes.as_slice()).unwrap();
+
+        let param: WalletKeyParam = WalletKeyParam {
+                id: import_result.id.to_string(),
+                key: Some(api::wallet_key_param::Key::DerivedKey(
+                    "2de5cb10b712be587f31e428e22984bd9ee420d198ddd742f70d746fff27d19904629dd64246a0ce2dbb1484c193d51bb2fd47d5611def5b4db4531d7abed824".to_string(),
+                )),
+            };
+
+        let ret = call_api("delete_keystore", param);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
+
+        let param: WalletKeyParam = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::DerivedKey(
+                derived_key_result.derived_key.to_owned(),
+            )),
+        };
+
+        let ret_bytes = call_api("delete_keystore", param).unwrap();
+        let ret: GeneralResult = GeneralResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(ret.is_success);
+
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+            private_key: "5JZc7wGRUr4J1RHDcM9ySWKLfQ2xjRUEo612qC4RLJ3G7jzJ4qx".to_string(),
+        };
+
+        let ret_bytes = call_api("exists_private_key", param).unwrap();
+        let ret: ExistsKeystoreResult = ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+
+        assert_eq!(false, ret.is_exists);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_keystore_exists() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+        let param: ExistsMnemonicParam = ExistsMnemonicParam {
+            mnemonic: TEST_MNEMONIC.to_string(),
+        };
+
+        let ret_bytes = call_api("exists_mnemonic", param).unwrap();
+        let result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(result.is_exists);
+        assert_eq!(result.id, wallet.id);
+
+        let wallet = import_default_pk_store();
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+            private_key: "L2hfzPyVC1jWH7n2QLTe7tVTb6btg9smp5UVzhEBxLYaSFF7sCZB".to_string(),
+        };
+
+        let ret_bytes = call_api("exists_private_key", param).unwrap();
+        let result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(result.is_exists);
+        assert_eq!(result.id, wallet.id);
+
+        let param: ExistsPrivateKeyParam = ExistsPrivateKeyParam {
+            private_key: "a392604efc2fad9c0b3da43b5f698a2e3f270f170d859912be0d54742275c5f6"
+                .to_string(),
+        };
+
+        let ret_bytes = call_api("exists_private_key", param).unwrap();
+        let result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(result.is_exists);
+        assert_eq!(result.id, wallet.id);
+
+        let wallet = import_default_wallet();
+        let param: ExistsMnemonicParam = ExistsMnemonicParam {
+            mnemonic: format!(
+                "{}",
+                " inject  kidney  empty canal shadow  pact comfort  wife crush horse wife sketch  "
+            )
+            .to_string(), //Badly formatted mnemonic
+        };
+
+        let ret_bytes = call_api("exists_mnemonic", param).unwrap();
+        let result: ExistsKeystoreResult =
+            ExistsKeystoreResult::decode(ret_bytes.as_slice()).unwrap();
+        assert!(result.is_exists);
+        assert_eq!(result.id, wallet.id);
+
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_ipfs_encrypt_and_decrypt() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let content = "imToken".to_string();
+        let param = EncryptDataToIpfsParam {
+            identifier: wallet.identifier.clone(),
+            content: content.clone(),
+        };
+        let ret = call_api("encrypt_data_to_ipfs", param).unwrap();
+        let resp: EncryptDataToIpfsResult =
+            EncryptDataToIpfsResult::decode(ret.as_slice()).unwrap();
+        assert!(!resp.encrypted.is_empty());
+        let param = DecryptDataFromIpfsParam {
+            identifier: wallet.identifier,
+            encrypted: resp.encrypted,
+        };
+        let ret = call_api("decrypt_data_from_ipfs", param).unwrap();
+        let resp: DecryptDataFromIpfsResult =
+            DecryptDataFromIpfsResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(content, resp.content);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_ipfs_encrypt_and_decrypt_before_migrate() {
+    run_test(|| {
+        fs::copy(
+            "../test-data/wallets/identity.json",
+            "/tmp/imtoken/wallets/identity.json",
+        )
+        .unwrap();
+        let content = "imToken".to_string();
+        let param = EncryptDataToIpfsParam {
+            identifier: "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg".to_string(),
+            content: content.clone(),
+        };
+        let ret = call_api("encrypt_data_to_ipfs", param).unwrap();
+        let resp: EncryptDataToIpfsResult =
+            EncryptDataToIpfsResult::decode(ret.as_slice()).unwrap();
+        assert!(!resp.encrypted.is_empty());
+        let param = DecryptDataFromIpfsParam {
+            identifier: "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg".to_string(),
+            encrypted: resp.encrypted,
+        };
+        let ret = call_api("decrypt_data_from_ipfs", param).unwrap();
+        let resp: DecryptDataFromIpfsResult =
+            DecryptDataFromIpfsResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(content, resp.content);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_authentication_message() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let param = SignAuthenticationMessageParam {
+            access_time: 1514736000,
+            identifier: wallet.identifier,
+            device_token: "12345ABCDE".to_string(),
+            key: Some(api::sign_authentication_message_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret = call_api("sign_authentication_message", param).unwrap();
+        let resp: SignAuthenticationMessageResult =
+            SignAuthenticationMessageResult::decode(ret.as_slice()).unwrap();
+        assert_eq!(resp.signature, "0x120cc977f9023c90635144bd0f4c8b85ff8aa23c003edcced9449f0465d05e954bccf9c114484e472c1837b0394f1933ad78ec8050673099e8bf5e9329737fe01c".to_string());
+    })
+}
diff --git a/token-core/tcx/tests/sign_test.rs b/token-core/tcx/tests/sign_test.rs
new file mode 100644
index 00000000..c1d57abf
--- /dev/null
+++ b/token-core/tcx/tests/sign_test.rs
@@ -0,0 +1,1185 @@
+use common::run_test;
+use serial_test::serial;
+use tcx::api::{EthBatchPersonalSignParam, EthBatchPersonalSignResult};
+
+mod common;
+use api::sign_param::Key;
+
+use tcx::api::derive_accounts_param::Derivation;
+use tcx::api::sign_hashes_param::DataToSign;
+use tcx::filemanager::KEYSTORE_MAP;
+
+use tcx::*;
+use tcx_atom::transaction::{AtomTxInput, AtomTxOutput};
+
+use tcx_eth2::transaction::{SignBlsToExecutionChangeParam, SignBlsToExecutionChangeResult};
+
+use crate::common::*;
+use prost::Message;
+use sp_core::ByteArray;
+use sp_runtime::traits::Verify;
+
+use tcx::api::{
+    sign_param, DeriveAccountsParam, DeriveAccountsResult, DerivedKeyResult, GeneralResult,
+    GetPublicKeysParam, GetPublicKeysResult, ImportMnemonicParam, KeystoreResult,
+    PublicKeyDerivation, SignHashesParam, SignHashesResult, SignParam, WalletKeyParam,
+};
+
+use tcx::handler::encode_message;
+use tcx::handler::get_derived_key;
+use tcx_btc_kin::transaction::BtcKinTxInput;
+use tcx_btc_kin::Utxo;
+use tcx_ckb::{CachedCell, CellInput, CkbTxInput, CkbTxOutput, OutPoint, Script, Witness};
+use tcx_constants::{sample_key, CurveType};
+use tcx_constants::{OTHER_MNEMONIC, TEST_PASSWORD};
+use tcx_keystore::Keystore;
+
+use tcx_common::hex::FromHex;
+use tcx_eth::transaction::{
+    AccessList, EthMessageInput, EthMessageOutput, EthTxInput, EthTxOutput,
+};
+use tcx_filecoin::{SignedMessage, UnsignedMessage};
+use tcx_substrate::{SubstrateRawTxIn, SubstrateTxOut};
+use tcx_tezos::transaction::{TezosRawTxIn, TezosTxOut};
+use tcx_tron::transaction::{TronMessageInput, TronMessageOutput, TronTxInput, TronTxOutput};
+
+#[test]
+#[serial]
+pub fn test_sign_ckb_tx() {
+    run_test(|| {
+        let wallet: KeystoreResult = import_default_wallet();
+        let out_points = vec![
+            OutPoint {
+                tx_hash: "0xfb9c020db967e84af1fbd755df5bc23427e2ed70f73e07895a0c394f6195f083"
+                    .to_owned(),
+                index: 0,
+            },
+            OutPoint {
+                tx_hash: "0xfb9c020db967e84af1fbd755df5bc23427e2ed70f73e07895a0c394f6195f083"
+                    .to_owned(),
+                index: 1,
+            },
+        ];
+
+        let code_hash =
+            "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8".to_owned();
+
+        let input = CkbTxInput {
+            inputs: vec![
+                CellInput {
+                    previous_output: Some(out_points[0].clone()),
+                    since: "".to_string(),
+                },
+                CellInput {
+                    previous_output: Some(out_points[1].clone()),
+                    since: "".to_string(),
+                },
+            ],
+            witnesses: vec![Witness::default(), Witness::default()],
+            cached_cells: vec![
+                CachedCell {
+                    capacity: 0,
+                    lock: Some(Script {
+                        hash_type: "type".to_string(),
+                        code_hash: code_hash.clone(),
+                        args: "0xb45772677603bccc71194b2557067fb361c1e093".to_owned(),
+                    }),
+                    out_point: Some(out_points[0].clone()),
+                    derived_path: "m/44'/309'/0'/0/1".to_string(),
+                },
+                CachedCell {
+                    capacity: 0,
+                    lock: Some(Script {
+                        hash_type: "type".to_string(),
+                        code_hash: code_hash.clone(),
+                        args: "0x2d79d9ed37184c1136bcfbe229947a137f80dec0".to_owned(),
+                    }),
+                    out_point: Some(out_points[1].clone()),
+                    derived_path: "m/44'/309'/0'/1/0".to_string(),
+                },
+            ],
+            tx_hash: "0x102b8e88daadf1b035577b4d5ea4f604be965df6a918e72daeff6c0c40753401"
+                .to_owned(),
+        };
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "NERVOS".to_string(),
+            path: "m/44'/309'/0'/0/0".to_string(),
+            curve: CurveType::SECP256k1.as_str().to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: encode_message(input).unwrap(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: CkbTxOutput = CkbTxOutput::decode(ret.as_slice()).unwrap();
+        assert_eq!("0x5500000010000000550000005500000041000000776e010ac7e7166afa50fe54cfecf0a7106a2f11e8110e071ccab67cb30ed5495aa5c5f5ca2967a2fe4a60d5ad8c811382e51d8f916ba2911552bef6dedeca8a00", output.witnesses[0]);
+        assert_eq!("0x5500000010000000550000005500000041000000914591d8abd5233740207337b0588fec58cad63143ddf204970526022b6db26d68311e9af49e1625e3a90e8a66eb1694632558d561d1e5d02cc7c7254e2d546100", output.witnesses[1]);
+
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_tron_tx() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
+        let input = TronTxInput { raw_data };
+        let input_value = encode_message(input).unwrap();
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password("WRONG PASSWORD".to_string())),
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            curve: "secp256k1".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "TRON1".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "unsupported_chain");
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
+        let expected_sign = "bbf5ce0549490613a26c3ac4fc8574e748eabda05662b2e49cea818216b9da18691e78cd6379000e9c8a35c13dfbf620f269be90a078b58799b56dc20da3bdf200";
+        assert_eq!(expected_sign, output.signatures[0]);
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_cosmos_tx() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let raw_data = "0a91010a8e010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126e0a2d636f736d6f733175616d6e346b74706d657332656664663671666837386d356365646b66637467617436657661122d636f736d6f73316a30636c726371727a636135326c6167707a3237687774713734776c327265353438346177681a0e0a057561746f6d1205313030303012680a510a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210232c1ef21d73c19531b0aa4e863cf397c2b982b2f958f60cdb62969824c096d6512040a02080118930312130a0d0a057561746f6d12043230303410b1f2041a0b636f736d6f736875622d34208cb201".to_string();
+        let input = AtomTxInput { raw_data };
+        let input_value = encode_message(input).unwrap();
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password("WRONG PASSWORD".to_string())),
+            chain_type: "COSMOS".to_string(),
+            path: "m/44'/118'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "COSMOS1".to_string(),
+            path: "m/44'/118'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "unsupported_chain");
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "COSMOS".to_string(),
+            path: "m/44'/118'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: AtomTxOutput = AtomTxOutput::decode(ret.as_slice()).unwrap();
+        let expected_sig = "355fWQ00dYitAZj6+EmnAgYEX1g7QtUrX/kQIqCbv05TCz0dfsWcMgXWVnr1l/I2hrjjQkiLRMoeRrmnqT2CZA==";
+        assert_eq!(expected_sig, output.signature);
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_substrate_raw_tx() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let unsigned_msg = "0x0600ffd7568e5f0a7eda67a82691ff379ac4bba4f9c9b859fe779b5d46363b61ad2db9e56c0703d148e25901007b000000dcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025bde8f69eeb5e065e18c6950ff708d7e551f68dc9bf59a07c52367c0280f805ec7";
+        let input = SubstrateRawTxIn {
+            raw_data: unsigned_msg.to_string(),
+        };
+
+        let input_value = encode_message(input).unwrap();
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "KUSAMA".to_string(),
+            path: "//kusama//imToken/0".to_string(),
+            curve: "sr25519".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: SubstrateTxOut = SubstrateTxOut::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(output.signature[0..4].to_string(), "0x01",);
+
+        let sig_bytes = Vec::from_hex(output.signature[4..].to_string()).unwrap();
+        let signature = sp_core::sr25519::Signature::from_slice(&sig_bytes).unwrap();
+
+        let pub_key =
+            Vec::from_hex("90742a577c8515391a46b7881c98c80ec92fe04255bb5b5fec862c7d633ada21")
+                .unwrap();
+        let singer = sp_core::sr25519::Public::from_slice(&pub_key).unwrap();
+        let msg = Vec::from_hex("0600ffd7568e5f0a7eda67a82691ff379ac4bba4f9c9b859fe779b5d46363b61ad2db9e56c0703d148e25901007b000000dcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025bde8f69eeb5e065e18c6950ff708d7e551f68dc9bf59a07c52367c0280f805ec7").unwrap();
+
+        assert!(
+            sp_core::sr25519::Signature::verify(&signature, msg.as_slice(), &singer),
+            "assert sig"
+        );
+
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_tron_tx_by_pk() {
+    run_test(|| {
+        let import_result = import_default_pk_store();
+
+        let derivation = Derivation {
+            chain_type: "TRON".to_string(),
+            path: "".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+        let param = DeriveAccountsParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::derive_accounts_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations: vec![derivation],
+        };
+
+        let ret = call_api("derive_accounts", param).unwrap();
+        let _rsp: DeriveAccountsResult = DeriveAccountsResult::decode(ret.as_slice()).unwrap();
+
+        let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
+        let input = TronTxInput { raw_data };
+        let tx = SignParam {
+            id: import_result.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: encode_message(input).unwrap(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
+        let expected_sign = "7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001";
+        assert_eq!(expected_sign, output.signatures[0]);
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_filecoin_bls() {
+    run_test(|| {
+        let import_result = import_filecoin_pk_store();
+
+        let message = UnsignedMessage {
+                to: "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey".to_string(),
+                from: "t3r52r4c7dxhzuhubdenjuxgfak5tbmb3pbcv35wngm6qgvo7bwmvbuuw274rwyhcp53ydtt3ugexjnltnk75q".to_string(),
+                nonce: 0,
+                value: "100000".to_string(),
+                gas_limit: 10000,
+                gas_fee_cap: "20000".to_string(),
+                gas_premium: "20000".to_string(),
+                method: 0,
+                params: "".to_string()
+            };
+
+        let tx = SignParam {
+            id: import_result.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "FILECOIN".to_string(),
+            path: "m/44'/461'/0'/0/0".to_string(),
+            curve: "bls12-381".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: encode_message(message).unwrap(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let signed = SignedMessage::decode(ret.as_slice()).unwrap();
+        let expected_sign = "r+CN2nhRN7d23jTFDvescYjkqg6iFwlcb2yZugewBsLko96E+UEYuSuhheaSGu1SDU7gYx54tsxYC/Zq3Pk0gfTAHPC2Ui9P5oNE3hNtb0mHO7D4ZHID2I4RxKFTAY8N" ;
+        assert_eq!(expected_sign, signed.signature.unwrap().data);
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_filecoin_secp256k1() {
+    run_test(|| {
+        let import_result = import_default_pk_store();
+
+        let message = UnsignedMessage {
+            to: "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey".to_string(),
+            from: "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i".to_string(),
+            nonce: 0,
+            value: "100000".to_string(),
+            gas_limit: 10000,
+            gas_fee_cap: "20000".to_string(),
+            gas_premium: "20000".to_string(),
+            method: 0,
+            params: "".to_string(),
+        };
+
+        let tx = SignParam {
+            id: import_result.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "FILECOIN".to_string(),
+            path: "m/44'/461'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: encode_message(message).unwrap(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let signed = SignedMessage::decode(ret.as_slice()).unwrap();
+        let expected_sign = "YJLfRrV7WovsWUY4nhKRp8Vs9AGC9J61zV8InwWM6IwxBVhtc20mJC7cxWdVMBQ45Mem2yS7bqQe7alkSxQvpwA=" ;
+        assert_eq!(expected_sign, signed.signature.unwrap().data);
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_by_dk_in_pk_store() {
+    run_test(|| {
+        let import_result = import_default_pk_store();
+
+        let param = WalletKeyParam {
+            id: import_result.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let ret_bytes = get_derived_key(&encode_message(param).unwrap()).unwrap();
+        let ret: DerivedKeyResult = DerivedKeyResult::decode(ret_bytes.as_slice()).unwrap();
+        let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
+        let input = TronTxInput { raw_data };
+        let tx = SignParam {
+            id: import_result.id.to_string(),
+            key: Some(Key::DerivedKey(ret.derived_key)),
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: encode_message(input.clone()).unwrap(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
+        let expected_sign = "7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001";
+        assert_eq!(expected_sign, output.signatures[0]);
+
+        let tx = SignParam {
+                id: import_result.id.to_string(),
+                key: Some(Key::DerivedKey("7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001".to_string())),
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                input: Some(::prost_types::Any {
+                    type_url: "imtoken".to_string(),
+                    value: encode_message(input.clone()).unwrap(),
+                }),
+            };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!("password_incorrect", format!("{}", ret.err().unwrap()));
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+fn test_tron_sign_message() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let input_expects = vec![
+                (TronMessageInput {
+                    value: "0x645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
+                        .to_string(),
+                    is_tron_header: true,
+                }, "0x16417c6489da3a88ef980bf0a42551b9e76181d03e7334548ab3cb36e7622a484482722882a29e2fe4587b95c739a68624ebf9ada5f013a9340d883f03fcf9af1b"),
+                (TronMessageInput {
+                    value: "645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76"
+                        .to_string(),
+                    is_tron_header: true,
+                }, "0x16417c6489da3a88ef980bf0a42551b9e76181d03e7334548ab3cb36e7622a484482722882a29e2fe4587b95c739a68624ebf9ada5f013a9340d883f03fcf9af1b"),
+                (TronMessageInput {
+                    value: "abcdef"
+                        .to_string(),
+                    is_tron_header: true,
+                }, "0x13e407627e584c821ba527d23d64163d458447dfea1c3bfc92be660aa8d093ee5cfa3881870c4c51f157828eb9d4f7fad8112761f3b51cf76c7a4a3f241033d51b"),
+            ];
+        for (input, expected) in input_expects {
+            let tx = SignParam {
+                id: wallet.id.to_string(),
+                key: Some(Key::Password(TEST_PASSWORD.to_string())),
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                input: Some(::prost_types::Any {
+                    type_url: "imtoken".to_string(),
+                    value: encode_message(input).unwrap(),
+                }),
+            };
+
+            let sign_result = call_api("sign_msg", tx).unwrap();
+            let ret: TronMessageOutput = TronMessageOutput::decode(sign_result.as_slice()).unwrap();
+            assert_eq!(expected, ret.signature);
+        }
+    });
+}
+
+#[test]
+#[serial]
+fn test_sign_by_dk_hd_store() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+        let input = TronMessageInput {
+            value: "0x645c0b7b58158babbfa6c6cd5a48aa7340a8749176b120e8516216787a13dc76".to_string(),
+            is_tron_header: true,
+        };
+
+        let dk_param = WalletKeyParam {
+            id: wallet.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+
+        let ret_bytes = get_derived_key(&encode_message(dk_param).unwrap()).unwrap();
+        let ret: DerivedKeyResult = DerivedKeyResult::decode(ret_bytes.as_slice()).unwrap();
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::DerivedKey(ret.derived_key)),
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: encode_message(input.clone()).unwrap(),
+            }),
+        };
+
+        let sign_result = call_api("sign_msg", tx).unwrap();
+        let ret: TronMessageOutput = TronMessageOutput::decode(sign_result.as_slice()).unwrap();
+        assert_eq!("0x16417c6489da3a88ef980bf0a42551b9e76181d03e7334548ab3cb36e7622a484482722882a29e2fe4587b95c739a68624ebf9ada5f013a9340d883f03fcf9af1b", ret.signature);
+
+        let tx = SignParam {
+                id: wallet.id.to_string(),
+                key: Some(Key::DerivedKey("7758c92df76d50774a67fdca6c90b922fc84be68c69164d4c7f500327bfa4b9655709b6b1f88e07e3bda266d7ca4b48c934557917692f63a31e301d79d7107d001".to_string())),
+                chain_type: "TRON".to_string(),
+                path: "m/44'/195'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+                network: "".to_string(),
+                seg_wit: "".to_string(),
+                input: Some(::prost_types::Any {
+                    type_url: "imtoken".to_string(),
+                    value: encode_message(input).unwrap(),
+                }),
+            };
+
+        let ret = call_api("sign_msg", tx);
+        assert!(ret.is_err());
+        assert_eq!("password_incorrect", format!("{}", ret.err().unwrap()));
+
+        remove_created_wallet(&wallet.id);
+    });
+}
+
+#[test]
+#[serial]
+pub fn test_sign_btc_fork_invalid_address() {
+    run_test(|| {
+        let chain_types = vec!["BITCOIN", "LITECOIN", "BITCOINCASH"];
+
+        let import_result: KeystoreResult = import_default_wallet();
+
+        for chain_type in chain_types {
+            let inputs = vec![Utxo {
+                tx_hash: "a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458"
+                    .to_string(),
+                vout: 0,
+                amount: 1000000,
+                address: "mszYqVnqKoQx4jcTdJXxwKAissE3Jbrrc1".to_string(),
+                derived_path: "0/0".to_string(),
+            }];
+            let tx_input = BtcKinTxInput {
+                inputs,
+                to: "invalid_address".to_string(),
+                amount: 500000,
+                fee: 100000,
+                change_address_index: Some(1u32),
+                op_return: None,
+            };
+            let input_value = encode_message(tx_input).unwrap();
+            let tx = SignParam {
+                id: import_result.id.to_string(),
+                key: Some(Key::Password(TEST_PASSWORD.to_string())),
+                chain_type: chain_type.to_string(),
+                path: "m/44'/0'/0'/0/0".to_string(),
+                curve: "secp256k1".to_string(),
+                network: "MAINNET".to_string(),
+                seg_wit: "".to_string(),
+                input: Some(::prost_types::Any {
+                    type_url: "imtoken".to_string(),
+                    value: input_value.clone(),
+                }),
+            };
+
+            let ret = call_api("sign_tx", tx);
+            assert!(ret.is_err());
+            assert_eq!(format!("{}", ret.err().unwrap()), "invalid_address");
+        }
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_lock_after_sign() {
+    run_test(|| {
+        let derivation = Derivation {
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "".to_string(),
+            curve: "".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let (wallet, _acc_rsp) = import_and_derive(derivation);
+
+        let raw_data = "0a0202a22208e216e254e43ee10840c8cbe4e3df2d5a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15415c68cc82c87446f602f019e5fd797437f5b79cc212154156a6076cd1537fa317c2606e4edfa4acd3e8e92e18a08d06709084e1e3df2d".to_string();
+        let input = TronTxInput { raw_data };
+        let input_value = encode_message(input).unwrap();
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "TRON".to_string(),
+            path: "m/44'/195'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+        };
+        {
+            let map = KEYSTORE_MAP.read();
+            let keystore: &Keystore = map.get(&wallet.id).unwrap();
+            assert!(keystore.is_locked());
+        }
+
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: TronTxOutput = TronTxOutput::decode(ret.as_slice()).unwrap();
+        let expected_sign = "bbf5ce0549490613a26c3ac4fc8574e748eabda05662b2e49cea818216b9da18691e78cd6379000e9c8a35c13dfbf620f269be90a078b58799b56dc20da3bdf200";
+        assert_eq!(expected_sign, output.signatures[0]);
+
+        {
+            let map = KEYSTORE_MAP.read();
+            let keystore: &Keystore = map.get(&wallet.id).unwrap();
+            assert!(keystore.is_locked());
+        }
+
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+#[ignore = "this case is test panic"]
+fn test_panic_keystore_locked() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+        let param = WalletKeyParam {
+            id: wallet.id.to_string(),
+            key: Some(api::wallet_key_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+        };
+        let _ret = call_api("unlock_then_crash", param);
+        let err = unsafe { _to_str(get_last_err_message()) };
+        let err_bytes = Vec::from_hex(err).unwrap();
+        let rsp: GeneralResult = GeneralResult::decode(err_bytes.as_slice()).unwrap();
+        assert!(!rsp.is_success);
+        assert_eq!(rsp.error, "test_unlock_then_crash");
+        let map = KEYSTORE_MAP.read();
+        let keystore: &Keystore = map.get(&wallet.id).unwrap();
+        assert!(keystore.is_locked())
+    });
+}
+
+#[test]
+#[serial]
+pub fn test_sign_tezos_tx() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let raw_data = "d3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700".to_string();
+        let input = TezosRawTxIn { raw_data };
+        let input_value = encode_message(input).unwrap();
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password("WRONG PASSWORD".to_string())),
+            chain_type: "TEZOS".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+            curve: "ed25519".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "password_incorrect");
+
+        let tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "TEZOS1".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+            curve: "ed25519".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value.clone(),
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx);
+        assert!(ret.is_err());
+        assert_eq!(format!("{}", ret.err().unwrap()), "unsupported_chain");
+
+        let mut tx = SignParam {
+            id: wallet.id.to_string(),
+            key: Some(Key::Password(TEST_PASSWORD.to_string())),
+            chain_type: "TEZOS".to_string(),
+            path: "m/44'/1729'/0'/0'".to_string(),
+            curve: "ed25519".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+        };
+
+        let ret = call_api("sign_tx", tx.clone()).unwrap();
+
+        let output: TezosTxOut = TezosTxOut::decode(ret.as_slice()).unwrap();
+        let expected_sign = "0df020458bdcfe24546488dd81e1bd7e2cb05379dc7c72ad626646ae22df5d3a652fdc4ffd2383dd5823a98fe158780928da07a3f0a234e23b759ce7b3a39a0c";
+        assert_eq!(expected_sign, output.signature.as_str());
+
+        let raw_data = "0xd3bdafa2e36f872e24f1ccd68dbdca4356b193823d0a6a54886d7641e532a2a26c00dedf1a2f428e5e85edf105cb3600949f3d0e8837c70cacb4e803e8528102c0843d0000dcdcf88d0cfb769e33b1888d6bdc351ee3277ea700".to_string();
+        let input = TezosRawTxIn { raw_data };
+        let input_value = encode_message(input).unwrap();
+        tx.input = Some(::prost_types::Any {
+            type_url: "imtoken".to_string(),
+            value: input_value,
+        });
+        let ret = call_api("sign_tx", tx).unwrap();
+        let output: TezosTxOut = TezosTxOut::decode(ret.as_slice()).unwrap();
+        let expected_sign = "0df020458bdcfe24546488dd81e1bd7e2cb05379dc7c72ad626646ae22df5d3a652fdc4ffd2383dd5823a98fe158780928da07a3f0a234e23b759ce7b3a39a0c";
+        assert_eq!(expected_sign, output.signature.as_str());
+        remove_created_wallet(&wallet.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_hashes() {
+    run_test(|| {
+        let param = ImportMnemonicParam {
+            mnemonic: OTHER_MNEMONIC.to_string(),
+            password: TEST_PASSWORD.to_string(),
+            name: "test-wallet".to_string(),
+            password_hint: "imtoken".to_string(),
+            overwrite: true,
+            network: "MAINNET".to_string(),
+        };
+        let ret = call_api("import_mnemonic", param).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+        let data_to_sign = vec![DataToSign {
+            hash: "3e0658d8284d8f50c0aa8fa6cdbd1bde0eb370d4b3489a26c83763671ace8b1c".to_string(),
+            path: "m/12381/3600/0/0".to_string(),
+            curve: "bls12-381".to_string(),
+            sig_alg: "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_".to_string(),
+        }];
+        let param = SignHashesParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::sign_hashes_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            data_to_sign,
+        };
+        let result_bytes = call_api("sign_hashes", param).unwrap();
+        let result = SignHashesResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(result.signatures.get(0).unwrap(), "0x8fa5d4dfe4766de7896f0e32c5bee9baae47aaa843cf5f1a2587dd9aaedf8a8c4400cb31bdcb1e90ddfe6d309e57841204dbf53704e4c4da3a9d25e9b4a09dac31a3221a7aac76f58ca21854173303cf58f039770a9e2307966e89faf0e5e79e");
+
+        let data_to_sign = vec![DataToSign {
+            hash: "3e0658d8284d8f50c0aa8fa6cdbd1bde0eb370d4b3489a26c83763671ace8b1c".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            sig_alg: "ECDSA".to_string(),
+        }];
+        let param = SignHashesParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::sign_hashes_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            data_to_sign,
+        };
+        let result_bytes = call_api("sign_hashes", param).unwrap();
+        let result = SignHashesResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(result.signatures.get(0).unwrap(), "0x80c4f5c9299d21dc62a91e6bd1868cda545e31cadbf0eff35f802a4509cecea2618e5b352843ac4f487d2b43ebd55cdf7ad0b78ca81a96504744cd4209ce343d00");
+
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_ethereum_legacy_tx() {
+    run_test(|| {
+        let derivation = Derivation {
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            chain_id: "1".to_string(),
+            curve: "secp256k1".to_string(),
+            bech32_prefix: "".to_string(),
+        };
+
+        let (wallet, acc_rsp) = import_and_derive(derivation);
+
+        let acc = acc_rsp.accounts.first().unwrap();
+        assert_eq!("tpubDCvte6zYB6DKMaEy4fwyoXpuExA4ery3Hu6dVSBZeY9Rg57VKFLwNPMfywWtqRFM1Df5gQJTu42RaaNCgVEyngdVfnYRh9Kb1UCoEYojURc", acc.extended_public_key);
+        assert_eq!("w6s0ZvUoPPSiEi1xDMKy5X9+qwhcX4u3e3LOBosJaOSro2ny9jppDxcczZfrhe29n9H3UkmgNoecq/85xfXkGDtH8PMR9iclK5WrcUtkgjXsBcrR6JF0j58i4W9x3y539vXOsLMifCmUr2RcqknDgw==", acc.encrypted_extended_public_key);
+
+        //legacy transaction
+        let eth_tx_input = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "20000000008".to_string(),
+            gas_limit: "189000".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "512".to_string(),
+            data: "".to_string(),
+            chain_id: "1".to_string(),
+            tx_type: "".to_string(),
+            max_fee_per_gas: "".to_string(),
+            max_priority_fee_per_gas: "".to_string(),
+            access_list: vec![],
+        };
+        let input_value = encode_message(eth_tx_input).unwrap();
+        let param = SignParam {
+            id: wallet.id.to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+            key: Some(sign_param::Key::Password(sample_key::PASSWORD.to_string())),
+        };
+        let ret = call_api("sign_tx", param).unwrap();
+        let output: EthTxOutput = EthTxOutput::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            output.tx_hash,
+            "0xa0a52398c499ccb09095148188eb027b463de3229f87bfebb8f944606047fd81"
+        );
+        assert_eq!(output.signature, "f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a06dfc00d1a38acf17137ca1524964ae7e596196703971c6a4d35ada8b09227305a061b8424f251f8724c335fc6df6088db863ee0ea05ebf68ca73a3622aafa19e94");
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_ethereum_eip1559_tx() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        //eip1559 transaction
+        let eth_tx_input = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "4286".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "3490361".to_string(),
+            data: "0x200184c0486d5f082a27".to_string(),
+            chain_id: "1".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list: vec![],
+        };
+        let input_value = encode_message(eth_tx_input).unwrap();
+        let param = SignParam {
+            id: wallet.id.to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+            key: Some(sign_param::Key::Password(sample_key::PASSWORD.to_string())),
+        };
+        let ret = call_api("sign_tx", param).unwrap();
+        let output: EthTxOutput = EthTxOutput::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            output.tx_hash,
+            "0x9a427f295369171f686d83a05b92d8849b822f1fa1c9ccb853e81de545f4625b"
+        );
+        assert_eq!(output.signature, "02f875010881e285faac6c45d88210be943535353535353535353535353535353535353535833542398a200184c0486d5f082a27c001a0602501c9cfedf145810f9b54558de6cf866a89b7a65890ccde19dd6cec1fe32ca02769f3382ee526a372241238922da39f6283a9613215fd98c8ce37a0d03fa3bb");
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_ethereum_eip1559_tx2() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+        //eip1559 transaction
+        let mut access_list = vec![];
+        access_list.push(AccessList {
+            address: "0x019fda53b3198867b8aae65320c9c55d74de1938".to_string(),
+            storage_keys: vec![],
+        });
+        access_list.push(AccessList {
+            address: "0x1b976cdbc43cfcbeaad2623c95523981ea1e664a".to_string(),
+            storage_keys: vec![
+                "0xd259410e74fa5c0227f688cc1f79b4d2bee3e9b7342c4c61342e8906a63406a2".to_string(),
+            ],
+        });
+        access_list.push(AccessList {
+            address: "0xf1946eba70f89687d67493d8106f56c90ecba943".to_string(),
+            storage_keys: vec![
+                "0xb3838dedffc33c62f8abfc590b41717a6dd70c3cab5a6900efae846d9060a2b9".to_string(),
+                "0x6a6c4d1ab264204fb2cdd7f55307ca3a0040855aa9c4a749a605a02b43374b82".to_string(),
+                "0x0c38e901d0d95fbf8f05157c68a89393a86aa1e821279e4cce78f827dccb2064".to_string(),
+            ],
+        });
+        let eth_tx_input = EthTxInput {
+            nonce: "8".to_string(),
+            gas_price: "".to_string(),
+            gas_limit: "4286".to_string(),
+            to: "0x3535353535353535353535353535353535353535".to_string(),
+            value: "3490361".to_string(),
+            data: "0x200184c0486d5f082a27".to_string(),
+            chain_id: "1".to_string(),
+            tx_type: "02".to_string(),
+            max_fee_per_gas: "1076634600920".to_string(),
+            max_priority_fee_per_gas: "226".to_string(),
+            access_list,
+        };
+        let input_value = encode_message(eth_tx_input).unwrap();
+        let param = SignParam {
+            id: wallet.id.to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+            key: Some(sign_param::Key::Password(sample_key::PASSWORD.to_string())),
+        };
+        let ret = call_api("sign_tx", param).unwrap();
+        let output: EthTxOutput = EthTxOutput::decode(ret.as_slice()).unwrap();
+        assert_eq!(
+            output.tx_hash,
+            "0x2c20edff7e496c1f8d8370fc3d70f3f02b4c63008bb2586d507ddb88d68cea7d"
+        );
+        assert_eq!(output.signature, "02f90141010881e285faac6c45d88210be943535353535353535353535353535353535353535833542398a200184c0486d5f082a27f8cbd694019fda53b3198867b8aae65320c9c55d74de1938c0f7941b976cdbc43cfcbeaad2623c95523981ea1e664ae1a0d259410e74fa5c0227f688cc1f79b4d2bee3e9b7342c4c61342e8906a63406a2f87a94f1946eba70f89687d67493d8106f56c90ecba943f863a0b3838dedffc33c62f8abfc590b41717a6dd70c3cab5a6900efae846d9060a2b9a06a6c4d1ab264204fb2cdd7f55307ca3a0040855aa9c4a749a605a02b43374b82a00c38e901d0d95fbf8f05157c68a89393a86aa1e821279e4cce78f827dccb206480a0d95cb4d82912b2fed0510dd44cce5c0b177af6e7ed991f1dbe5b8e34303bf84ca04e0896caf07d9644e2728d919a84f7af46cb2421a0ce7bb814cce782d921e672");
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_ethereum_sign_message() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+
+        let eth_tx_input = EthMessageInput {
+            message: "0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765".to_string(),
+            signature_type: 0i32,
+        };
+        let input_value = encode_message(eth_tx_input).unwrap();
+        let param = SignParam {
+            id: wallet.id.to_string(),
+            chain_type: "ETHEREUM".to_string(),
+            path: "m/44'/60'/0'/0/0".to_string(),
+            curve: "secp256k1".to_string(),
+            network: "".to_string(),
+            seg_wit: "".to_string(),
+            input: Some(::prost_types::Any {
+                type_url: "imtoken".to_string(),
+                value: input_value,
+            }),
+            key: Some(sign_param::Key::Password(sample_key::PASSWORD.to_string())),
+        };
+        let ret = call_api("sign_msg", param).unwrap();
+        let output: EthMessageOutput = EthMessageOutput::decode(ret.as_slice()).unwrap();
+
+        assert_eq!(output.signature, "0x5d595524847790aade63630ba4320854e0ae474b50d4c83eadfea9179185b2d67479cdfa9f59ec8f62575a7c09d4a5c9683aaf9cdb198ee51bdbe1bbf6eed1e91b");
+    })
+}
+
+#[test]
+#[serial]
+pub fn test_sign_bls_to_execution_change() {
+    run_test(|| {
+        let param = ImportMnemonicParam {
+                mnemonic: "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art".to_string(),
+                password: TEST_PASSWORD.to_string(),
+                name: "test-wallet".to_string(),
+                password_hint: "imtoken".to_string(),
+                overwrite: true,
+                network: "MAINNET".to_string(),
+            };
+        let ret = call_api("import_mnemonic", param).unwrap();
+        let import_result: KeystoreResult = KeystoreResult::decode(ret.as_slice()).unwrap();
+
+        let derivations = vec![PublicKeyDerivation {
+            path: "m/12381/3600/0/0".to_string(),
+            curve: "bls12-381".to_string(),
+            chain_type: "ETHEREUM2".to_string(),
+        }];
+        let param = GetPublicKeysParam {
+            id: import_result.id.to_string(),
+            key: Some(crate::api::get_public_keys_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            derivations,
+        };
+        let result_bytes = call_api("get_public_keys", param).unwrap();
+        let result = GetPublicKeysResult::decode(result_bytes.as_slice()).unwrap();
+        assert_eq!(result.public_keys.clone().get(0).unwrap(), "0x99b1f1d84d76185466d86c34bde1101316afddae76217aa86cd066979b19858c2c9d9e56eebc1e067ac54277a61790db");
+
+        let mut param = SignBlsToExecutionChangeParam {
+            id: import_result.id.to_string(),
+            key: Some(
+                tcx_eth2::transaction::sign_bls_to_execution_change_param::Key::Password(
+                    TEST_PASSWORD.to_owned(),
+                ),
+            ),
+            genesis_fork_version: "0x03000000".to_string(),
+            genesis_validators_root:
+                "0x4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95".to_string(),
+            validator_index: vec![0],
+            from_bls_pub_key: result.public_keys.get(0).unwrap().to_owned(),
+            eth1_withdrawal_address: "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15".to_string(),
+        };
+        let ret_bytes = call_api("sign_bls_to_execution_change", param.clone()).unwrap();
+        let result: SignBlsToExecutionChangeResult =
+            SignBlsToExecutionChangeResult::decode(ret_bytes.as_slice()).unwrap();
+
+        assert_eq!(result.signeds.get(0).unwrap().signature, "8c8ce9f8aedf380e47548501d348afa28fbfc282f50edf33555a3ed72eb24d710bc527b5108022cffb764b953941ec4014c44106d2708387d26cc84cbc5c546a1e6e56fdc194cf2649719e6ac149596d80c86bf6844b36bd47038ee96dd3962f");
+        param.eth1_withdrawal_address = "0x8c1Ff978036F2e9d7CC382Eff7B4c8c53C22ac15XX".to_string();
+        let result = call_api("sign_bls_to_execution_change", param.clone());
+        assert_eq!(
+            result.err().unwrap().to_string(),
+            "invalid_eth_address".to_string()
+        );
+        remove_created_wallet(&import_result.id);
+    })
+}
+
+#[test]
+#[serial]
+fn test_eth_batch_personal_sign_by_private_key() {
+    run_test(|| {
+        let wallet = import_default_pk_store();
+        let param = EthBatchPersonalSignParam {
+            id: wallet.id.to_string(),
+            key: Some(api::eth_batch_personal_sign_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            data: vec![
+                "Hello imToken".to_string(),
+                "0xef678007d18427e6022059dbc264f27507cd1ffc".to_string(),
+            ],
+            path: "".to_string(),
+        };
+        let sign_result = call_api("eth_batch_personal_sign", param).unwrap();
+        let ret: EthBatchPersonalSignResult =
+            EthBatchPersonalSignResult::decode(sign_result.as_slice()).unwrap();
+        assert_eq!(ret.signatures[0], "0x1be38ff0ab0e6d97cba73cf61421f0641628be8ee91dcb2f73315e7fdf4d0e2770b0cb3cc7350426798d43f0fb05602664a28bb2c9fcf46a07fa1c8c4e322ec01b".to_string());
+        assert_eq!(ret.signatures[1], "0xb12a1c9d3a7bb722d952366b06bd48cb35bdf69065dee92351504c3716a782493c697de7b5e59579bdcc624aa277f8be5e7f42dc65fe7fcd4cc68fef29ff28c21b".to_string());
+    });
+}
+
+#[test]
+#[serial]
+fn test_eth_batch_personal_sign_by_hd() {
+    run_test(|| {
+        let wallet = import_default_wallet();
+        let param = EthBatchPersonalSignParam {
+            id: wallet.id.to_string(),
+            key: Some(api::eth_batch_personal_sign_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            data: vec![
+                "Hello imToken".to_string(),
+                "0xef678007d18427e6022059dbc264f27507cd1ffc".to_string(),
+            ],
+            path: "".to_string(),
+        };
+        let sign_result = call_api("eth_batch_personal_sign", param).unwrap();
+        let ret: EthBatchPersonalSignResult =
+            EthBatchPersonalSignResult::decode(sign_result.as_slice()).unwrap();
+        assert_eq!(ret.signatures[0], "0xb270b1e5ee1345c693b7b4fd7f5287f6b6372059c89590dfcadc4edf94ec9293296d3e205495f1468953a4f893cd6798b66301a51571fe2a419e75d5755b5bc91c".to_string());
+        assert_eq!(ret.signatures[1], "0x19671e4c92847629fa5bbba59e70402f54366e61db0555984a83cc512413fc462d6be1508f1accdee6ad0040ed7401ac2db33d17e1aa4e66bedcb9f75c250cfa1b".to_string());
+
+        let param = EthBatchPersonalSignParam {
+            id: wallet.id.to_string(),
+            key: Some(api::eth_batch_personal_sign_param::Key::Password(
+                TEST_PASSWORD.to_owned(),
+            )),
+            data: vec![
+                "Please sign this message with your Ethereum account: 0x0d3Dfa13F3C0eD29A68012352C71E5695Ef3f9fc
+
+I confirm that I want to unstake and exit this validator: 0xb9a451e8e71d1b62d00355103768c4a2eeedb5e95b127f7145c284adcd0a9c1b1b5224ac73d6555c3962b03f9840942a
+
+Chain ID: 5
+Issued At: 2024-02-27T06:45:12.725Z".to_string(),
+            ],
+            path: "m/44'/60'/0'/0/0".to_string(),
+        };
+        let sign_result = call_api("eth_batch_personal_sign", param).unwrap();
+        let ret: EthBatchPersonalSignResult =
+            EthBatchPersonalSignResult::decode(sign_result.as_slice()).unwrap();
+        assert_eq!(ret.signatures[0], "0xa30a252dd84370a22035b1bdd43e594bb54c3e874f3cee2b4c12e16392feb3c13d4589d3f2b006fcad20426a4cb2b16c3523cc82705d1e447a9926cb1e2398481c".to_string());
+    });
+}
diff --git a/token-core/test-data/.gitignore b/token-core/test-data/.gitignore
index 9f9736c5..15c8f302 100644
--- a/token-core/test-data/.gitignore
+++ b/token-core/test-data/.gitignore
@@ -2,4 +2,21 @@
 */
 !.gitignore
 !default_keystore_hd.json
-!default_keystore_pk.json
\ No newline at end of file
+!default_keystore_pk.json
+!wallets
+!wallets/*
+!wallets/imkey/*
+!wallets-ios-2_14_1
+!wallets-ios-2_14_1/*
+wallets-ios-2_14_1/identity-wallet-ids.json
+!scan-keystores-fixtures
+!scan-keystores-fixtures/*
+!mainnet-identity
+!mainnet-identity/*
+!testnet-identity
+!testnet-identity/*
+!migrate-duplication-fixtures
+!migrate-duplication-fixtures/wallets/**
+wallets/_migrated.json
+!identity-keystore-delete
+!identity-keystore-delete/wallets/*
\ No newline at end of file
diff --git a/token-core/test-data/default_keystore_pk.json b/token-core/test-data/default_keystore_pk.json
index 034fe74e..3416f330 100644
--- a/token-core/test-data/default_keystore_pk.json
+++ b/token-core/test-data/default_keystore_pk.json
@@ -1,7 +1,7 @@
 {
   "id": "cb1ba2d7-7b89-4595-9753-d16b6e317c6b",
   "version": 11001,
-  "keyHash": "4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+  "soruceFingerPrint": "4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
   "crypto": {
     "cipher": "aes-128-ctr",
     "cipherparams": {
@@ -17,21 +17,11 @@
     },
     "mac": "a03fa095a9f36e0e12936e4d39ab3b942537ec1080fe77a30724f966f092a662"
   },
-  "activeAccounts": [
-    {
-      "address": "TXo4VDm8Qc5YBSjPhu8pMaxzTApSvLshWG",
-      "derivationPath": "",
-      "curve": "SECP256k1",
-      "coin": "TRON",
-      "network": "",
-      "segWit": "",
-      "extPubKey": ""
-    }
-  ],
+
   "imTokenMeta": {
     "name": "Unknown",
     "passwordHint": "",
     "timestamp": 1576654549,
     "source": "PRIVATE"
   }
-}
\ No newline at end of file
+}
diff --git a/token-core/test-data/identity-keystore-delete/wallets/.DS_Store b/token-core/test-data/identity-keystore-delete/wallets/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/token-core/test-data/identity-keystore-delete/wallets/.DS_Store differ
diff --git a/token-core/test-data/identity-keystore-delete/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358 b/token-core/test-data/identity-keystore-delete/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358
new file mode 100644
index 00000000..cab57d2b
--- /dev/null
+++ b/token-core/test-data/identity-keystore-delete/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358
@@ -0,0 +1,39 @@
+{
+  "address": "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB",
+  "imTokenMeta": {
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": "1703213076.948025",
+    "backup": [],
+    "mode": "normal",
+    "name": "BTC",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "BITCOIN",
+    "network": "TESTNET",
+    "segWit": "P2WPKH"
+  },
+  "id": "00fc0804-7cea-46d8-9e95-ed1efac65358",
+  "encMnemonic": {
+    "nonce": "406c972f073ebf5b9102d262e6713408",
+    "encStr": "76b940d06641023f995cffde6ee9c4bc7c063a780897b5debd619aafc769b37db684eafb10dd48c3c3cbcb810952bb4455984fde5aa34a1dfb4d5ad93293c0d3f3a78124639a4530b4c2"
+  },
+  "xpub": "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv",
+  "crypto": {
+    "kdfparams": {
+      "dklen": 32,
+      "r": 8,
+      "salt": "8fac63b4cc6d75817269a380bc8107572ecba3a8fe1ab87e46e30ab696ce2320",
+      "p": 1,
+      "n": 262144
+    },
+    "mac": "6daa39ee727416a135b02d6183c71624de0b7cf74fb3a3d1562488e66f308c76",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "cdde8cafd9eff3f9715ef40577913e2ded3b8a9f009781d3367e4a1b02e95894c45ab6ef2658e7ef99b8437cba0f05f5c12caca60e97745b71581075f086a57afac8f626f3d2f7c94813edb6eb26b5cf8147fd32419a3abc762d71dc2be77d555cb75e983a74fa45f7b08e59ce7945",
+    "cipherparams": {
+      "iv": "a575c61a89577eea45af32df6aa4005a"
+    },
+    "kdf": "scrypt"
+  },
+  "version": 44,
+  "mnemonicPath": "m/49'/1'/0'"
+}
diff --git a/token-core/test-data/identity-keystore-delete/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json b/token-core/test-data/identity-keystore-delete/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
new file mode 100644
index 00000000..b0e2ffdc
--- /dev/null
+++ b/token-core/test-data/identity-keystore-delete/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
@@ -0,0 +1,106 @@
+{
+  "id": "0a2756cd-ff70-437b-9bdb-ad46b8bb0819",
+  "version": 11000,
+  "keyHash": "512115eca3ae86646aeb06861d551e403b543509",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "acc1209c400cfff80668e9a36ef8a2e5" },
+    "ciphertext": "033964aa3253c904f50b3798a14299802765ddd84ffa7b699e24ee531076ab6256682a45c8f4c9a4c98f202e5791f5061833d3936fc9f12728d1658ea6bb49fac38e577861981a5e5d43",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "4fba99988c8eec256f138e1f5e098b03d91461b8969544878f315343f42d1e5f"
+    },
+    "mac": "d94cca35619e88fccdc6778b8c0c5691fe163378b02cf32ec3e6afbe0ce5ff05"
+  },
+  "activeAccounts": [
+    {
+      "address": "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2",
+      "derivationPath": "m/44'/195'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "TRON",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "037e39800880000000988ebb67dc6f173948ccaed62dd3c4b60fea66a4280da93eed971b55d4e6e9c203349ff19e96c1aa7f568e493f85fa506320410245b4e69146bb0d3d8b5df3b901",
+      "publicKey": "037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5"
+    },
+    {
+      "address": "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6",
+      "derivationPath": "m/44'/309'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "NERVOS",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "03b4fb97788000000048c75f39fe91ddfe4a0e6ef2fa53795a006e0e78f06b1af7d2b107ea3cefe22903ad9d0e2d9181e23c7075a56ed4f10e249aaf38a2bb7aa0cb604f8b768ea84b86",
+      "publicKey": "03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd"
+    },
+    {
+      "address": "qqurlwqukz3lcujttcyvlzaagppnd4c37chrtrylmc",
+      "derivationPath": "m/44'/1'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "BITCOINCASH",
+      "network": "TESTNET",
+      "segWit": "NONE",
+      "extPubKey": "036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020",
+      "publicKey": "033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4e"
+    },
+    {
+      "address": "myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ",
+      "derivationPath": "m/44'/2'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "LITECOIN",
+      "network": "TESTNET",
+      "segWit": "NONE",
+      "extPubKey": "03bd0b1c14800000003bd4b941a0eebb0bfa4c3324bb77f0a1643aa80d112e2a6d48187c1b333a3d2d02c7709248e6205fefa7366efb0269021f1f2f1e04fdc334fe7c7fd2628d7451e8",
+      "publicKey": "0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b"
+    },
+    {
+      "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "KUSAMA",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"
+    },
+    {
+      "address": "16hsF1UW1kob7vUR7tymVNCmp1eo18uhhtc4szetH4xbYpbd",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "POLKADOT",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"
+    },
+    {
+      "address": "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+      "derivationPath": "m/44'/461'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "03d2bab08e80000000b2045e43ef88287b28ca49251d4fdc5e2810b1340e7e1be6fe3f8e968c33e4fd02611325073f61ae5feb6c8dce96857d007cdb765937e53e43e6f91374dac62edb",
+      "publicKey": "03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785"
+    },
+    {
+      "address": "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz",
+      "derivationPath": "m/44'/1729'/0'/0'",
+      "curve": "ED25519",
+      "coin": "TEZOS",
+      "network": "MAINNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "tcx-wallet",
+    "passwordHint": "",
+    "timestamp": 1703213098,
+    "source": "MNEMONIC"
+  }
+}
diff --git a/token-core/test-data/identity-keystore-delete/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d b/token-core/test-data/identity-keystore-delete/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
new file mode 100644
index 00000000..3f086a2f
--- /dev/null
+++ b/token-core/test-data/identity-keystore-delete/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
@@ -0,0 +1,67 @@
+{
+  "encMnemonic": {
+    "encStr": "476ee81e62675ffb5e727f8e3f15f0222ff084bd4b064089d7a8397efe10bde265d965b214171f9e946128c7855cf53866b753021f6df8bd49b92bdb2caed5b8f618667177eaa5594933",
+    "nonce": "b553ebb7521eb1a9aa7d8738811ab102"
+  },
+  "keyPathPrivates": [
+    {
+      "derivedMode": "HD_SHA256",
+      "path": "",
+      "publicKey": "EOS7tpXQ1thFJ69ZXDqqEan7GMmuWdcptKmwgbs7n1cnx3hWPw3jw",
+      "privateKey": {
+        "encStr": "e44fc17b5bedd1f3409c07c84067f4d8af051b6edf72bfda4a4306f00f87cbde",
+        "nonce": "5485ffc4230fa0d389dde221ec22a0e2"
+      }
+    },
+    {
+      "privateKey": {
+        "encStr": "4267397725dda86d8a45079d7246fac0784c75494308cd8f5c5f157d74ce3a65",
+        "nonce": "d2f0a53208b5ddbda3e3c1808e92c64c"
+      },
+      "derivedMode": "HD_SHA256",
+      "publicKey": "EOS5SxZMjhKiXsmjxac8HBx56wWdZV1sCLZESh3ys1rzbMn4FUumU",
+      "path": ""
+    },
+    {
+      "privateKey": {
+        "nonce": "dae366211338af8bcc01610b0358b78e",
+        "encStr": "622c4a67b70c3e1fb33653dc56dc961cd8b4185252f31dceebab15a98e77f361"
+      },
+      "publicKey": "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+      "path": "m/44'/194'/0'/0/0",
+      "derivedMode": "PATH_DIRECTLY"
+    }
+  ],
+  "mnemonicPath": "m/44'/194'/0'/0/0",
+  "id": "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+  "version": 10001,
+  "crypto": {
+    "kdf": "scrypt",
+    "kdfparams": {
+      "salt": "43800be9d3459b3ce9b61826555165d5706a2e8ecfceb9e4b1fa341d743f5e60",
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "p": 1
+    },
+    "mac": "50a4fdbb20dc1a860ac93134e9edf15267f9f1a2443c4a329841bc17553758a9",
+    "cipherparams": {
+      "iv": "ac19624cfcb3cd32bd092ddf73aa6157"
+    },
+    "ciphertext": "7cd696ce21680fb9b02c326ec0563b05",
+    "cipher": "aes-128-ctr"
+  },
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "segWit": "NONE",
+    "mode": "normal",
+    "backup": [],
+    "timestamp": "1703213102.143412",
+    "source": "RECOVERED_IDENTITY",
+    "name": "EOS",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "EOS"
+  },
+  "address": ""
+}
diff --git a/token-core/test-data/identity-keystore-delete/wallets/identity.json b/token-core/test-data/identity-keystore-delete/wallets/identity.json
new file mode 100644
index 00000000..ecab78d3
--- /dev/null
+++ b/token-core/test-data/identity-keystore-delete/wallets/identity.json
@@ -0,0 +1,54 @@
+{
+  "imTokenMeta": {
+    "network": "TESTNET",
+    "name": "identity_name",
+    "version": "iOS-2.14.1.1742",
+    "source": "RECOVERED_IDENTITY",
+    "passwordHint": "",
+    "timestamp": "1703213073.8432422",
+    "backup": [],
+    "segWit": "P2WPKH",
+    "mode": "normal"
+  },
+  "version": 10000,
+  "walletIds": [
+    "0597526e-105f-425b-bb44-086fc9dc9568",
+    "00fc0804-7cea-46d8-9e95-ed1efac65358",
+    "ac59ccc1-285b-47a7-92f5-a6c432cee21a",
+    "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+    "f3615a56-cb03-4aa4-a893-89944e49920d",
+    "60573d8d-8e83-45c3-85a5-34fbb2aad5e1",
+    "9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3",
+    "9b696367-69c1-4cfe-8325-e5530399fc3f",
+    "6c20aab6-1596-456d-9749-212e6139c5ed",
+    "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+    "9f4acb4a-7431-4c7d-bd25-a19656a86ea0",
+    "d9e3bb9c-87fd-4836-b146-10a3e249eb75"
+  ],
+  "crypto": {
+    "cipherparams": { "iv": "b947b2ece06b648a75187dcddee67cc1" },
+    "ciphertext": "5f1cbaef883def74b4b27a64586188da00f020f9611d1efc84dffba5ae31a173962e2196589aa66a065e5e0f929b26eac27ca04c8eecc0727f5f91e0038cf6aaba9d827c76c6f225ceaa9d937c3a3f1a958e5fe74585565175d301ead8a67f401250abcd0e832f76a4ed37628170b6",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "mac": "deeabc0d49e9b2ec0eb97d55cff25e2c14ff74e257c96145fb8e47bc31d8df26",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "p": 1,
+      "salt": "b0fdfcb67bdfc6461d907f6b55c364ce98e21057b74df586953e2bc6e293c248"
+    }
+  },
+  "encMnemonic": {
+    "encStr": "74c4b82c2af67c35b8ff31c3547a705d94f9a66397f1aa4118eb6450ec140f055117ec2a87a4402069a3837db7d1b20d16e4e1b9b93c6b615c739b833bd9cb20148c6c37efd777fb6b30",
+    "nonce": "a293778a4eec6fdd6f7c7ac0edcd869f"
+  },
+  "encAuthKey": {
+    "encStr": "628e9f0926f12abed0c201bc605af2a378a72cbc397c182c270888ca7dad4d1f",
+    "nonce": "93e5aff1a87c6f3be9b5bef506478dae"
+  },
+  "id": "d5017486-f9b2-4aeb-8f7b-c57da9b77668",
+  "identifier": "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg",
+  "ipfsId": "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU",
+  "encKey": "9513617c9b398edebfb46080a8f0cf6cab6763866bb06daa63503722bea78907"
+}
diff --git a/token-core/test-data/mainnet-identity/identity.json b/token-core/test-data/mainnet-identity/identity.json
new file mode 100644
index 00000000..8435d794
--- /dev/null
+++ b/token-core/test-data/mainnet-identity/identity.json
@@ -0,0 +1,43 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "76e228e45cc66228e1890dec1d211de6"
+    },
+    "ciphertext": "18ce44f304402417eb96f3468a4f49450cb4b6916c32522ae5173960db929f486ff373781f1fca4742ed853b6c2d7e6951533a68805ae7586befc7d830718a3d8e9074ea6cd5bb361a1b06cf3c2cf8b4d82755c6639816b3ec1727cdd0b5e45a144f5cf943177a30ee9ecee2a65314",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 65535,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "519463106b45fcb3ffcb39b1b8805cdb3d789a908502ce5f3b976dbca780a2d0"
+    },
+    "mac": "359ea5fe92c0dce5ab03a31e354de1f33a9f7cb822f012d00da68bddc7b02c5d"
+  },
+  "id": "a1b92c23-5fcb-43a7-a8fe-07bb56acd033",
+  "version": 10000,
+  "encAuthKey": {
+    "encStr": "ba3afce29774e6225f6bd24df91fb911dc4583f8d999669912388ce461d49ac0",
+    "nonce": "b1ab60c19a5fc6568bef1eea30d38a98"
+  },
+  "encKey": "9513617c9b398edebfb46080a8f0cf6c",
+  "encMnemonic": {
+    "encStr": "01dfbda9bd529fda10233082e8bed9ea7b7acda60c7f676f9cc5a4cf7c6f65bd3426e5e3cfec27652d9e36f0f855dbd2f8f0693b79f82bece69cd291ec2979862a45b40e758f48336c41",
+    "nonce": "869c45b926817db6a842eec33acf846e"
+  },
+  "identifier": "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg",
+  "ipfsId": "QmVoPZQnQjppqcD4gUh1KrfmjbWQCtXQpm2YrFG6Voquh2",
+  "walletIDs": [
+    "175169f7-5a35-4df7-93c1-1ff612168e71",
+    "02a55ab6-554a-4e78-bc26-6a7acced7e5e",
+    "045861fe-0e9b-4069-92aa-0ac03cad55e0"
+  ],
+  "imTokenMeta": {
+    "backup": [],
+    "network": "MAINNET",
+    "name": "identity_name",
+    "passwordHint": "",
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": 1519611220
+  }
+}
diff --git a/token-core/test-data/migrate-duplication-fixtures/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json b/token-core/test-data/migrate-duplication-fixtures/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json
new file mode 100644
index 00000000..63f43b27
--- /dev/null
+++ b/token-core/test-data/migrate-duplication-fixtures/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json
@@ -0,0 +1,36 @@
+{
+  "id": "300b42bc-0948-4734-82cb-4293dfeeefd2",
+  "version": 11000,
+  "keyHash": "dae3455556d5d8393bd6eab490f3fd826dea11d7",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "9d32a43c6b72fb2d2e4b2270710c8433" },
+    "ciphertext": "53a7b92e1e298aacb3d8a2c60af33bf32859cee2d864f96f224a2efb0e6cb9424c692465e7f16ac10658ed4f77112b1d1e6d4f0c70a330ede4a328ed0988e29ff98597ac16bf7024ecd8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "b75cf0eef6f8336496dd3ff6154ab722a48f257e0d722c279df44f59f50c4829"
+    },
+    "mac": "b7af11db0bc1017475cff76c66a8bd273d17ca8afc801cc455d8f6b5c04c09a2"
+  },
+  "activeAccounts": [
+    {
+      "address": "ckt1qyqgkffut7e7md39tp5ts9vxssj7wdw8z4cquyflka",
+      "derivationPath": "m/44'/309'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "NERVOS",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "0388738aff800000002c2f44d1805be1ced7fc390a43385c492ba910f3423865d86ce16ea53689cd410371dcfc20fae2ed0020d5f4dc5ba5650b6a838fe3d0fc546c6a054ec54e8b46f6",
+      "publicKey": "0314ec66f9ba5135e15a6477cd0ac63b2ede974e085f5fb324f26b4bef8891da2c"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "Imported 6",
+    "passwordHint": "",
+    "timestamp": 1703214731,
+    "source": "MNEMONIC"
+  }
+}
diff --git a/token-core/test-data/migrate-duplication-fixtures/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f b/token-core/test-data/migrate-duplication-fixtures/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f
new file mode 100644
index 00000000..09a51f7a
--- /dev/null
+++ b/token-core/test-data/migrate-duplication-fixtures/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f
@@ -0,0 +1,38 @@
+{
+  "id": "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+  "mnemonicPath": "m/44'/60'/0'/0/1",
+  "encMnemonic": {
+    "nonce": "27d0fbb70bd03ce0e96824c0f88bb6ad",
+    "encStr": "b8e34c4ff5ee92f80cd893244c89be1ad75614550b4fde40eb81a214c4676623ec5f92076f495dc3204ab06533cccabbb218b01fbaa47255b56d7c17543aa3462d2f246169fb3377e422"
+  },
+  "imTokenMeta": {
+    "source": "MNEMONIC",
+    "passwordHint": "",
+    "backup": [],
+    "chain": "ETHEREUM",
+    "mode": "normal",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "version": "iOS-2.14.1.1742",
+    "timestamp": "1703217176.7788029",
+    "name": "Imported 12"
+  },
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "kdf": "scrypt",
+    "ciphertext": "a3f81f417cf96399c178fd18c058cf0cdc1023116e293c3c6fe5aa8a58f972f9",
+    "mac": "42f62a4647194f4efe78a07e8517ef9f4974b4bfb71524ed8dc8282f36780ce5",
+    "kdfparams": {
+      "salt": "59663950940345f9e69183f11f74319db35646ae7cd5be2f9f9bc478c07b4f1e",
+      "n": 262144,
+      "dklen": 32,
+      "r": 8,
+      "p": 1
+    },
+    "cipherparams": {
+      "iv": "4f64c9458e04b387dad5c7d0eaab8c91"
+    }
+  },
+  "address": "7152bcad819b084d57179e293d2765ffa0109e04",
+  "version": 3
+}
diff --git a/token-core/test-data/migrate-duplication-fixtures/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f b/token-core/test-data/migrate-duplication-fixtures/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f
new file mode 100644
index 00000000..07cd1aa6
--- /dev/null
+++ b/token-core/test-data/migrate-duplication-fixtures/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f
@@ -0,0 +1,38 @@
+{
+  "encMnemonic": {
+    "nonce": "2008d58e51c5404c3c40b9356367b4aa",
+    "encStr": "15f43fbbcedea68eed7366c97978590c4c967c241eccf04ec262037c19e5b674da17af29ccb3c1a20d8ee329f093664f6946a3a4c7a7d14dba6ac57d6ba8930c541397ed1726ba1bb1ce"
+  },
+  "crypto": {
+    "kdfparams": {
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "salt": "baa68d0f96f49b047c284534d840950ceb819f84b88c5a416b4d5b9ea17f5aa8",
+      "p": 1
+    },
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "4f0e3646ec292b97862ef9d3591266d40afe2d262478a50da4fc101e8063cac8",
+    "mac": "8e8b0cd5f92eee4934bbdc9ff14be7800f9a612e34bb8e6a868ece82485a35d1",
+    "cipherparams": {
+      "iv": "30845f11343a0cde4c4d51f46d700f24"
+    }
+  },
+  "imTokenMeta": {
+    "version": "iOS-2.14.1.1742",
+    "name": "Imported 4",
+    "source": "MNEMONIC",
+    "chain": "COSMOS",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "timestamp": "1703214474.4959989",
+    "passwordHint": "",
+    "mode": "normal",
+    "backup": []
+  },
+  "mnemonicPath": "m/44'/118'/0'/0/0",
+  "address": "cosmos1m566v5rcklnac8vc0dftfu4lnvznhlu7d3f404",
+  "version": 3,
+  "id": "9b696367-69c1-4cfe-8325-e5530399fc3f"
+}
diff --git a/token-core/test-data/scan-keystores-fixtures/1055741c-2904-4973-b7ee-4b69bfd8bcc6.json b/token-core/test-data/scan-keystores-fixtures/1055741c-2904-4973-b7ee-4b69bfd8bcc6.json
new file mode 100644
index 00000000..7dc845a9
--- /dev/null
+++ b/token-core/test-data/scan-keystores-fixtures/1055741c-2904-4973-b7ee-4b69bfd8bcc6.json
@@ -0,0 +1,38 @@
+{
+  "id": "1055741c-2904-4973-b7ee-4b69bfd8bcc6",
+  "version": 12000,
+  "sourceFingerprint": "0x572d4a6f166f1f25e7e1c7da85cf158568de63d2",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "53fce95f7949b0e6414069274b1b6a46" },
+    "ciphertext": "c72dab8e5d50d971884bce863a7b05cf03df03f341e1e1cb11eef318422a67d5d3d0dfb23f58ea196d8690d58026bb42a356d2f1566a64d442c48eaf73e15ca18a1643657dab8927a173",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "3155ddb9a3d8574ea2da02fc797ceb4c1e3f47246f62e523a052d33a93407905"
+    },
+    "mac": "0ebe924875dc1ba7c4bc90a0013746aad4319e1b40d587055589183610b518d3"
+  },
+  "identity": {
+    "encAuthKey": {
+      "encStr": "1962d698be31e8587e90dfd0ba84e947a3a6e2c09d11679119fcdc87d8941124",
+      "nonce": "cc24fcd80df0c769597fddece1c92e40"
+    },
+    "encKey": "bc914e88212e1548868f2f4df5182ed18638b881d49ea6949d0098e2476c45b4",
+    "identifier": "im14x5UYkoqtYbJFTLam7c9Ft4BQiFvJbieKWfK",
+    "ipfsId": "Qme1RuM33X8SmVjisWS3sP4irqNZv6vuqL3L3T6poZ6c2b"
+  },
+  "encOriginal": {
+    "encStr": "8ea1342fb801666b760fb230860e601dcc5c18b4b01026a46ab3e5f5e12edf22903267fc562aa201a0b898c65ce2d7487f8c9ae34fc63ef6db588392ef5f2e7b179ec3a05d207450abf8",
+    "nonce": "f5d58f0db798cd5c9f80fb088fe8dd91"
+  },
+  "imTokenMeta": {
+    "name": "test-wallet",
+    "passwordHint": "imtoken",
+    "timestamp": 1705040852,
+    "source": "MNEMONIC",
+    "network": "MAINNET"
+  }
+}
diff --git a/token-core/test-data/scan-keystores-fixtures/1233134b-8377-4fb0-b06f-56062e858708.json b/token-core/test-data/scan-keystores-fixtures/1233134b-8377-4fb0-b06f-56062e858708.json
new file mode 100644
index 00000000..f3e72c92
--- /dev/null
+++ b/token-core/test-data/scan-keystores-fixtures/1233134b-8377-4fb0-b06f-56062e858708.json
@@ -0,0 +1,40 @@
+{
+  "id": "1233134b-8377-4fb0-b06f-56062e858708",
+  "version": 12001,
+  "sourceFingerprint": "0xa27b5222f4f53dee8c446a380cf40370a48992c3",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "31deaa1033b2a55cc39916b347453649" },
+    "ciphertext": "c52bbc9842da2e9afdf8b905585db5ea4b86920f54f76e5ce686586604a29c3cc152ba9f309d2a1995cddb0ecafbe4d1f43ad033d1e0f5a02e68eda7c2f71687",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "87436212538c3d747df0988246078a308bed9245388badf88dbeb21806e6dd49"
+    },
+    "mac": "53af7ee52b69782e775a46def178d0b629c94b04e70fbddc5adafa437b6144e6"
+  },
+  "identity": {
+    "encAuthKey": {
+      "encStr": "469a36a33162394918b11ef94af8b6df6a497e75abde1fdf94d8bb2f99f45525",
+      "nonce": "3cadd1f99f1ed15f86b4e809281a523c"
+    },
+    "encKey": "579b60c2484957677b9de76f6cfec64aa506f223781dc9ca6bd5e9dbc4cf6708",
+    "identifier": "im14x5FoX7EWwJ1KkNyfSzjafR6JZ6wqUUVr3mR",
+    "ipfsId": "QmQmj2fza2Ep3hxZZRoeco3ZKccoP1vvGJ3ddjDrDMV9UF"
+  },
+  "curve": "sr25519",
+  "encOriginal": {
+    "encStr": "1800fbe9cd5b4a553173b2f6602767653ca4056fbfa10a8c99a672c134751073346e4bafffcdaad4dc3124e2dca9b5c69777d93fba97f93f99269fb3186684822f273c046185753d9825c74d1686ad235f717463c90602cd42bdaa0772d54eed3608865a552ae5e939440685eafd23bba92899f1026e1ebf16287a80897b6e069c4e3dab05d37b6f909e4630f33774e72123bafdbbae674e70eeb0e64b21e1c83f0dc972b3e24abe1e9fcbf15231e898d7cf976506384ef3368df7b2239531c30ca4b5e62818b8b8ef6b69c7b34e903ebab5a892df1502a29e78f3da7d1b626b7e5c27c1ada685978be1f0e1573f3c98c3014efd2dc5ffd209be4222e7600b5bdd190648d528fedd7bb6291f4491b4545e7c1f35f4203f83f97067e721738ac5d2afea6444dc347d69a105570ac367b2df0bf96948b91a66f28e2eb2bfe93ff4bf9ae9c1b23eb840694d93e12eea156b63372bb56094d47769383823f8a48fdedb4044d9cc18dd515c49437d48a605909dbd49817f80d12a9336b6dce2a71e112379b1714541bc63bf3ba25c4a6509038b98991fd1eac0801a96a75c74bf3aa53a5b7dd5c4c6e8386836b5daa6cd8d90222a652ba72633c69c9fe66765174ee2d40277c3c1159233ec910ea03e02b7a40b8a366cf774bc9ef24d4934556d78b793cea567180854db62e5fceab5d21e1935cb7af1fcf3c06e1b58705a9fb6e93680fb2b5064b93d23cf74a321f37abb5507ab308290bfc4eae8cd49b3569169cae40de135865f466b99246bdafb6bc63eeb88ec732a9c5ca967c223f84161433c8402e453e0ca90d07ba573b5c6ce64d6779037048fda77d606728589e349b4a01ff991520ff21c7cbd50d172bd0d6a9135a316e4cf54e32a94bc2ecea0dcedfa2d32ed91c95628464c34e3384cdc940a8cd99e820dc58b63ae073b142d47fb01071eebc6d82f13b1d6c01232c29642a78d034bb953324d42f5d5a687729f3449da6d363be09aa0accc4a9e338cefcfd7a9ac2b7a742db45fecabea3f56586f0e68b2dc6e3978e81529caa587bd571647c1fdcea7ed",
+    "nonce": "ec689fea9630cdcac4ba30b17fee9908"
+  },
+  "imTokenMeta": {
+    "name": "test account",
+    "passwordHint": "",
+    "timestamp": 1705041327,
+    "source": "SUBSTRATE_KEYSTORE",
+    "network": "MAINNET",
+    "identifiedChainTypes": ["KUSAMA", "POLKADOT"]
+  }
+}
diff --git a/token-core/test-data/scan-keystores-fixtures/7e1c2c55-5b7f-4a5a-8061-c42b594ceb2f.json b/token-core/test-data/scan-keystores-fixtures/7e1c2c55-5b7f-4a5a-8061-c42b594ceb2f.json
new file mode 100644
index 00000000..6269b667
--- /dev/null
+++ b/token-core/test-data/scan-keystores-fixtures/7e1c2c55-5b7f-4a5a-8061-c42b594ceb2f.json
@@ -0,0 +1,40 @@
+{
+  "id": "7e1c2c55-5b7f-4a5a-8061-c42b594ceb2f",
+  "version": 12001,
+  "sourceFingerprint": "0xc7b60806a2af1e89f107b9410da3ab8a825fe5a2",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "4886f87d5146bdf736f994a8f2fdb1ef" },
+    "ciphertext": "9a0c5425268293ec8ceb22e8020eb604861b38ad37643d2cce9f1d7c342535a7",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "6495d26f1ce474c79c2df4278ceb102e0638ab496d5a046069bc248ba33abc4e"
+    },
+    "mac": "972cebf11e0556a0524c82df89d7cf0c9a4cd73b3c1e52df2d16ab609f3ea300"
+  },
+  "identity": {
+    "encAuthKey": {
+      "encStr": "e15d8f4066dfbf21f6c6639c412bfc60cc62ed914724712e14fd7e7a5e02f0fd",
+      "nonce": "2f0b92fb11a23a0db55ea1c7a63eb568"
+    },
+    "encKey": "d2ada8f248a6593fe9a7094650b7349554e7b310acd4ac0344dd654c18e27724",
+    "identifier": "im14x5LYRt5YsM5iTr2xd6dQ75euijaoDs3nRB2",
+    "ipfsId": "QmSpWyzy5gkYyJiagFHzfkJwqzDdcjCA3qeu8T3JFd54vZ"
+  },
+  "curve": "bls12-381",
+  "encOriginal": {
+    "encStr": "40609c3b01d036a06281a968aa625499c33e411008f7a0badd68ef484e4283df694a61f6f21f0bfdfdf9c7cb653d9ae0c188b1551bcb548151db1581a40239e5b234054f572570f4ce5bd6afab51b2924eb6333063124d69b21eb612e4c45512da5ae41a682aa72d435a91fe0186545147c44fd94bbb57f13d49b7a82e3c3d4e5ba77c0d6222b5e19a8970ba61b8092445fbce17",
+    "nonce": "35ef6f3ac243ffc8a1f5dcacfed2d37b"
+  },
+  "imTokenMeta": {
+    "name": "test_filecoin_import_private_key",
+    "passwordHint": "",
+    "timestamp": 1705040730,
+    "source": "PRIVATE",
+    "network": "MAINNET",
+    "identifiedChainTypes": ["FILECOIN"]
+  }
+}
diff --git a/token-core/test-data/scan-keystores-fixtures/beb68589-0f0f-41e2-94d9-d78f10a72dec.json b/token-core/test-data/scan-keystores-fixtures/beb68589-0f0f-41e2-94d9-d78f10a72dec.json
new file mode 100644
index 00000000..858bdc14
--- /dev/null
+++ b/token-core/test-data/scan-keystores-fixtures/beb68589-0f0f-41e2-94d9-d78f10a72dec.json
@@ -0,0 +1,40 @@
+{
+  "id": "beb68589-0f0f-41e2-94d9-d78f10a72dec",
+  "version": 12001,
+  "sourceFingerprint": "0xe6cfaab9a59ba187f0a45db0b169c21bb48f09b3",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "f36fd85f9910a4c7660e29265b0f0cd8" },
+    "ciphertext": "e826806cbc139314bd7b3521649db590c0f54a0a8326284e50d21de692402024",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "f9e1fa072cf26063ed6abd676cd7a686d2ebd02942a853891417c3a1cdefe4c4"
+    },
+    "mac": "9f0ffdbf29a5fe22c38f95381c99f076d54e00f88a713083a43d600562a5c7ec"
+  },
+  "identity": {
+    "encAuthKey": {
+      "encStr": "4e37f597063fcfd75aa12b29b94c80ac6db404a9f799869ee7afdedf0e767199",
+      "nonce": "0dfaf70fe1b569ffb86ee6c53b691f4d"
+    },
+    "encKey": "f42b7d20e2800724fc6e3e4b19e14c998fda72a479facf2ba9a1a7321de4770d",
+    "identifier": "im14x5UPbCXmU2HMQ8jfeKcCDrQYhDppRYaa5C6",
+    "ipfsId": "QmczBPUeohPPaE8UnPiESyynPwffBqrn4RqrU6nPJw95VT"
+  },
+  "curve": "secp256k1",
+  "encOriginal": {
+    "encStr": "b4d10c701d47f2bd80e850a764ef0c5350a380e73d260c1319859b805a26b43ef03897fca311757ddc915c0cfd3717d1c0b0ac824e27eeeee1350048302782eb1fa18a1e32d10abcd46c1f303a6126d93e433d47c2692c5bd3f672de0d6b57bb1c4e23a2018c7758500edd7dc1843d2a615660e560fb5ff4c0be9575695ba58d21e912515432412c771aecc3de656fa0cc73cf2e7f1880818fad8180a131a592",
+    "nonce": "1668131a1f7e4163f4b0bec8641df6f4"
+  },
+  "imTokenMeta": {
+    "name": "test_filecoin_import_private_key",
+    "passwordHint": "",
+    "timestamp": 1705040607,
+    "source": "PRIVATE",
+    "network": "MAINNET",
+    "identifiedChainTypes": ["FILECOIN"]
+  }
+}
diff --git a/token-core/test-data/scan-keystores-fixtures/efcfffb2-9b63-418b-a9d0-ec3600012284.json b/token-core/test-data/scan-keystores-fixtures/efcfffb2-9b63-418b-a9d0-ec3600012284.json
new file mode 100644
index 00000000..1a854ba2
--- /dev/null
+++ b/token-core/test-data/scan-keystores-fixtures/efcfffb2-9b63-418b-a9d0-ec3600012284.json
@@ -0,0 +1,40 @@
+{
+  "id": "efcfffb2-9b63-418b-a9d0-ec3600012284",
+  "version": 12001,
+  "sourceFingerprint": "0x6bd7cc4e20a7de71296b81758d29447dfde9a388",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "722a2420e64186dbb08eefa728c912a4" },
+    "ciphertext": "e3b0c0c4274970ee8ef071e4f2735853396cbaadc13d5b60e8155eb95e3eb5bb",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "7dd675ede69d86a129eb52fbc370ead9fdfd2ef1316e019ab7736e18e8f5ab53"
+    },
+    "mac": "df47301ab9bb92628ebe29c8a8192a3331a8906aa57a634a9c4877d26cd65dc7"
+  },
+  "identity": {
+    "encAuthKey": {
+      "encStr": "6f7a00b69ac83aa1416a2dec37926ce25df81d9d8835a55bf1e8197141e59761",
+      "nonce": "efc01a5c065494921ac7d5f602736046"
+    },
+    "encKey": "823dc41660514b6c6cc0dea8e58d572893f81c8870d73becfd20e648c6c3d525",
+    "identifier": "im14x5AU2zU5oRyNdGgNbemdP39ATmu16eVgPFQ",
+    "ipfsId": "Qmb8K5w1fzdTbjTiATvSecNgZYvbMJ6gJB9JPG254aEY8F"
+  },
+  "curve": "ed25519",
+  "encOriginal": {
+    "encStr": "c4e466e5bd9dbd7d5120889445da8a42bf207f1fbac154a5430bf31ce4073636a62dcf3266ffbc27fedc97aa01661081908f9af9dc6659355d44d44b41c8181197996bb852ac8d292f2b663287a89546161ac823604b618a7a75fba845092f3becb2",
+    "nonce": "46c782c39c9494d45687f933a7b97d0b"
+  },
+  "imTokenMeta": {
+    "name": "test_tezos_import_private_key_export",
+    "passwordHint": "",
+    "timestamp": 1705041022,
+    "source": "PRIVATE",
+    "network": "MAINNET",
+    "identifiedChainTypes": ["TEZOS"]
+  }
+}
diff --git a/token-core/test-data/testnet-identity/identity.json b/token-core/test-data/testnet-identity/identity.json
new file mode 100644
index 00000000..ecab78d3
--- /dev/null
+++ b/token-core/test-data/testnet-identity/identity.json
@@ -0,0 +1,54 @@
+{
+  "imTokenMeta": {
+    "network": "TESTNET",
+    "name": "identity_name",
+    "version": "iOS-2.14.1.1742",
+    "source": "RECOVERED_IDENTITY",
+    "passwordHint": "",
+    "timestamp": "1703213073.8432422",
+    "backup": [],
+    "segWit": "P2WPKH",
+    "mode": "normal"
+  },
+  "version": 10000,
+  "walletIds": [
+    "0597526e-105f-425b-bb44-086fc9dc9568",
+    "00fc0804-7cea-46d8-9e95-ed1efac65358",
+    "ac59ccc1-285b-47a7-92f5-a6c432cee21a",
+    "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+    "f3615a56-cb03-4aa4-a893-89944e49920d",
+    "60573d8d-8e83-45c3-85a5-34fbb2aad5e1",
+    "9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3",
+    "9b696367-69c1-4cfe-8325-e5530399fc3f",
+    "6c20aab6-1596-456d-9749-212e6139c5ed",
+    "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+    "9f4acb4a-7431-4c7d-bd25-a19656a86ea0",
+    "d9e3bb9c-87fd-4836-b146-10a3e249eb75"
+  ],
+  "crypto": {
+    "cipherparams": { "iv": "b947b2ece06b648a75187dcddee67cc1" },
+    "ciphertext": "5f1cbaef883def74b4b27a64586188da00f020f9611d1efc84dffba5ae31a173962e2196589aa66a065e5e0f929b26eac27ca04c8eecc0727f5f91e0038cf6aaba9d827c76c6f225ceaa9d937c3a3f1a958e5fe74585565175d301ead8a67f401250abcd0e832f76a4ed37628170b6",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "mac": "deeabc0d49e9b2ec0eb97d55cff25e2c14ff74e257c96145fb8e47bc31d8df26",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "p": 1,
+      "salt": "b0fdfcb67bdfc6461d907f6b55c364ce98e21057b74df586953e2bc6e293c248"
+    }
+  },
+  "encMnemonic": {
+    "encStr": "74c4b82c2af67c35b8ff31c3547a705d94f9a66397f1aa4118eb6450ec140f055117ec2a87a4402069a3837db7d1b20d16e4e1b9b93c6b615c739b833bd9cb20148c6c37efd777fb6b30",
+    "nonce": "a293778a4eec6fdd6f7c7ac0edcd869f"
+  },
+  "encAuthKey": {
+    "encStr": "628e9f0926f12abed0c201bc605af2a378a72cbc397c182c270888ca7dad4d1f",
+    "nonce": "93e5aff1a87c6f3be9b5bef506478dae"
+  },
+  "id": "d5017486-f9b2-4aeb-8f7b-c57da9b77668",
+  "identifier": "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg",
+  "ipfsId": "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU",
+  "encKey": "9513617c9b398edebfb46080a8f0cf6cab6763866bb06daa63503722bea78907"
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/00fc0804-7cea-46d8-9e95-ed1efac65358 b/token-core/test-data/wallets-ios-2_14_1/00fc0804-7cea-46d8-9e95-ed1efac65358
new file mode 100644
index 00000000..cab57d2b
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/00fc0804-7cea-46d8-9e95-ed1efac65358
@@ -0,0 +1,39 @@
+{
+  "address": "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB",
+  "imTokenMeta": {
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": "1703213076.948025",
+    "backup": [],
+    "mode": "normal",
+    "name": "BTC",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "BITCOIN",
+    "network": "TESTNET",
+    "segWit": "P2WPKH"
+  },
+  "id": "00fc0804-7cea-46d8-9e95-ed1efac65358",
+  "encMnemonic": {
+    "nonce": "406c972f073ebf5b9102d262e6713408",
+    "encStr": "76b940d06641023f995cffde6ee9c4bc7c063a780897b5debd619aafc769b37db684eafb10dd48c3c3cbcb810952bb4455984fde5aa34a1dfb4d5ad93293c0d3f3a78124639a4530b4c2"
+  },
+  "xpub": "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv",
+  "crypto": {
+    "kdfparams": {
+      "dklen": 32,
+      "r": 8,
+      "salt": "8fac63b4cc6d75817269a380bc8107572ecba3a8fe1ab87e46e30ab696ce2320",
+      "p": 1,
+      "n": 262144
+    },
+    "mac": "6daa39ee727416a135b02d6183c71624de0b7cf74fb3a3d1562488e66f308c76",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "cdde8cafd9eff3f9715ef40577913e2ded3b8a9f009781d3367e4a1b02e95894c45ab6ef2658e7ef99b8437cba0f05f5c12caca60e97745b71581075f086a57afac8f626f3d2f7c94813edb6eb26b5cf8147fd32419a3abc762d71dc2be77d555cb75e983a74fa45f7b08e59ce7945",
+    "cipherparams": {
+      "iv": "a575c61a89577eea45af32df6aa4005a"
+    },
+    "kdf": "scrypt"
+  },
+  "version": 44,
+  "mnemonicPath": "m/49'/1'/0'"
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/0597526e-105f-425b-bb44-086fc9dc9568 b/token-core/test-data/wallets-ios-2_14_1/0597526e-105f-425b-bb44-086fc9dc9568
new file mode 100644
index 00000000..c3bb060d
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/0597526e-105f-425b-bb44-086fc9dc9568
@@ -0,0 +1,38 @@
+{
+  "address": "6031564e7b2f5cc33737807b2e58daff870b590b",
+  "encMnemonic": {
+    "nonce": "2965662f34c72c81a88c1db2aca114b4",
+    "encStr": "ddd91dd4d10cf6baf95ca5feac29936e687d2053af23c286acfac9aecab28d27b9035b561da5c779fa46793ea04ea227f8021fba29588470324efbfece7bd32485285a26a847c17fa84c"
+  },
+  "id": "0597526e-105f-425b-bb44-086fc9dc9568",
+  "mnemonicPath": "m/44'/60'/0'/0/0",
+  "imTokenMeta": {
+    "name": "ETH",
+    "chain": "ETHEREUM",
+    "version": "iOS-2.14.1.1742",
+    "network": "MAINNET",
+    "backup": [],
+    "segWit": "NONE",
+    "timestamp": "1703213075.42502",
+    "passwordHint": "",
+    "mode": "normal",
+    "source": "RECOVERED_IDENTITY"
+  },
+  "crypto": {
+    "ciphertext": "17ab523c759dbcf3104dc3e3b69b8b2c7f188bf8379af98257d2fec06688402a",
+    "kdf": "scrypt",
+    "mac": "97f5ed556e84a95422de0d85ba17b71320c91d203b6a42214e151bcf40cdf0de",
+    "cipherparams": {
+      "iv": "3a95e7bb685f2873efba577839ea8915"
+    },
+    "kdfparams": {
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "p": 1,
+      "salt": "4f84c01e3fdbaac75feff106bea17dde9d9f7cc3db05043664e958fe50f2ed05"
+    },
+    "cipher": "aes-128-ctr"
+  },
+  "version": 3
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json b/token-core/test-data/wallets-ios-2_14_1/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
new file mode 100644
index 00000000..29c34345
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
@@ -0,0 +1,106 @@
+{
+  "id": "0a2756cd-ff70-437b-9bdb-ad46b8bb0819",
+  "version": 11000,
+  "keyHash": "512115eca3ae86646aeb06861d551e403b543509",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "acc1209c400cfff80668e9a36ef8a2e5" },
+    "ciphertext": "033964aa3253c904f50b3798a14299802765ddd84ffa7b699e24ee531076ab6256682a45c8f4c9a4c98f202e5791f5061833d3936fc9f12728d1658ea6bb49fac38e577861981a5e5d43",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "4fba99988c8eec256f138e1f5e098b03d91461b8969544878f315343f42d1e5f"
+    },
+    "mac": "d94cca35619e88fccdc6778b8c0c5691fe163378b02cf32ec3e6afbe0ce5ff05"
+  },
+  "activeAccounts": [
+    {
+      "address": "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2",
+      "derivationPath": "m/44'/195'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "TRON",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "037e39800880000000988ebb67dc6f173948ccaed62dd3c4b60fea66a4280da93eed971b55d4e6e9c203349ff19e96c1aa7f568e493f85fa506320410245b4e69146bb0d3d8b5df3b901",
+      "publicKey": "037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5"
+    },
+    {
+      "address": "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6",
+      "derivationPath": "m/44'/309'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "NERVOS",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "03b4fb97788000000048c75f39fe91ddfe4a0e6ef2fa53795a006e0e78f06b1af7d2b107ea3cefe22903ad9d0e2d9181e23c7075a56ed4f10e249aaf38a2bb7aa0cb604f8b768ea84b86",
+      "publicKey": "03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd"
+    },
+    {
+      "address": "qqurlwqukz3lcujttcyvlzaagppnd4c37chrtrylmc",
+      "derivationPath": "m/44'/1'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "BITCOINCASH",
+      "network": "TESTNET",
+      "segWit": "NONE",
+      "extPubKey": "036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020",
+      "publicKey": "033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4e"
+    },
+    {
+      "address": "myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ",
+      "derivationPath": "m/44'/2'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "LITECOIN",
+      "network": "TESTNET",
+      "segWit": "NONE",
+      "extPubKey": "03bd0b1c14800000003bd4b941a0eebb0bfa4c3324bb77f0a1643aa80d112e2a6d48187c1b333a3d2d02c7709248e6205fefa7366efb0269021f1f2f1e04fdc334fe7c7fd2628d7451e8",
+      "publicKey": "0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b"
+    },
+    {
+      "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "KUSAMA",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"
+    },
+    {
+      "address": "16hsF1UW1kob7vUR7tymVNCmp1eo18uhhtc4szetH4xbYpbd",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "POLKADOT",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"
+    },
+    {
+      "address": "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+      "derivationPath": "m/44'/461'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "03d2bab08e80000000b2045e43ef88287b28ca49251d4fdc5e2810b1340e7e1be6fe3f8e968c33e4fd02611325073f61ae5feb6c8dce96857d007cdb765937e53e43e6f91374dac62edb",
+      "publicKey": "03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785"
+    },
+    {
+      "address": "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz",
+      "derivationPath": "m/44'/1729'/0'/0'",
+      "curve": "ED25519",
+      "coin": "TEZOS",
+      "network": "MAINNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703213098,
+    "source": "MNEMONIC"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/300b42bc-0948-4734-82cb-4293dfeeefd2.json b/token-core/test-data/wallets-ios-2_14_1/300b42bc-0948-4734-82cb-4293dfeeefd2.json
new file mode 100644
index 00000000..63f43b27
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/300b42bc-0948-4734-82cb-4293dfeeefd2.json
@@ -0,0 +1,36 @@
+{
+  "id": "300b42bc-0948-4734-82cb-4293dfeeefd2",
+  "version": 11000,
+  "keyHash": "dae3455556d5d8393bd6eab490f3fd826dea11d7",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "9d32a43c6b72fb2d2e4b2270710c8433" },
+    "ciphertext": "53a7b92e1e298aacb3d8a2c60af33bf32859cee2d864f96f224a2efb0e6cb9424c692465e7f16ac10658ed4f77112b1d1e6d4f0c70a330ede4a328ed0988e29ff98597ac16bf7024ecd8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "b75cf0eef6f8336496dd3ff6154ab722a48f257e0d722c279df44f59f50c4829"
+    },
+    "mac": "b7af11db0bc1017475cff76c66a8bd273d17ca8afc801cc455d8f6b5c04c09a2"
+  },
+  "activeAccounts": [
+    {
+      "address": "ckt1qyqgkffut7e7md39tp5ts9vxssj7wdw8z4cquyflka",
+      "derivationPath": "m/44'/309'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "NERVOS",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "0388738aff800000002c2f44d1805be1ced7fc390a43385c492ba910f3423865d86ce16ea53689cd410371dcfc20fae2ed0020d5f4dc5ba5650b6a838fe3d0fc546c6a054ec54e8b46f6",
+      "publicKey": "0314ec66f9ba5135e15a6477cd0ac63b2ede974e085f5fb324f26b4bef8891da2c"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "Imported 6",
+    "passwordHint": "",
+    "timestamp": 1703214731,
+    "source": "MNEMONIC"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/46e8e653-dd05-4217-b225-faafc8451a2c.json b/token-core/test-data/wallets-ios-2_14_1/46e8e653-dd05-4217-b225-faafc8451a2c.json
new file mode 100644
index 00000000..ba6c9c29
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/46e8e653-dd05-4217-b225-faafc8451a2c.json
@@ -0,0 +1,36 @@
+{
+  "id": "46e8e653-dd05-4217-b225-faafc8451a2c",
+  "version": 11001,
+  "keyHash": "e74f1ec2f7d09b494c6679b24dc0379d0942084f",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "04e1ebd84e6f814197c98390321ebcd7" },
+    "ciphertext": "e8a4e34c0d8295d8df53edaf786ed46327aafa8cb12454f69ffe12e3a749e904",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "0d091a3c11a9e65a641b7e9eb5d19b6dcf814a4baea8219f1c57ac7a3283ea0c"
+    },
+    "mac": "64c31149419ae08e3c3bcb0e0b8195c19398af21017a4bde285b5a3f115c203b"
+  },
+  "activeAccounts": [
+    {
+      "address": "LavE5eHDvw9VDiNifbraR7GyY8MRvcQSLQ",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "LITECOIN",
+      "network": "MAINNET",
+      "segWit": "NONE",
+      "extPubKey": "",
+      "publicKey": "03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703226999,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/483cb13e-5e59-4428-a219-018de4ce60f6.json b/token-core/test-data/wallets-ios-2_14_1/483cb13e-5e59-4428-a219-018de4ce60f6.json
new file mode 100644
index 00000000..dbae897c
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/483cb13e-5e59-4428-a219-018de4ce60f6.json
@@ -0,0 +1,36 @@
+{
+  "id": "483cb13e-5e59-4428-a219-018de4ce60f6",
+  "version": 11001,
+  "keyHash": "857768c6e939731056de55f93ac8dd084dfa7495",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "aa8a78aed3e97d248a4e3bf9b59e199b" },
+    "ciphertext": "7718a2d0f422d519984e386c818a39f36cf0eb36175e3a899c5e4385fe51637f",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "3bb181ab7ef0e6a39d21852529a141789e48ff898e54178a69aa0bb9639ea601"
+    },
+    "mac": "c52c0f60943b8db9111e23e73e26f1dc699de10dbca65852510488925ed47546"
+  },
+  "activeAccounts": [
+    {
+      "address": "qpvtgl4r5h4mexvme0w59xunuzfnzkq585cj4skrp4",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "BITCOINCASH",
+      "network": "MAINNET",
+      "segWit": "NONE",
+      "extPubKey": "",
+      "publicKey": "024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703226876,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json b/token-core/test-data/wallets-ios-2_14_1/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json
new file mode 100644
index 00000000..e3a4aadd
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json
@@ -0,0 +1,36 @@
+{
+  "id": "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca",
+  "version": 11001,
+  "keyHash": "4e6c074ea45b5fb91dedde3d0f2a98e4bacebad6",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "b861ccef945108ba4549144de514d5ae" },
+    "ciphertext": "d6ab3a9f78cc610d2af5ea977531b958e3ca9d4b6d308591b9ac6c3b7b371d20",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "6581f8aeb6abf554444a2af18704628a1c49fdb5046a5ba7687d90445a166d4e"
+    },
+    "mac": "74c9ae251a8addc7a34332cfcedae390054148abc82127ce15279d418e634e53"
+  },
+  "activeAccounts": [
+    {
+      "address": "TC1nbfByaLWHvK8haEFTkMZJBNxsnKfqKh",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "TRON",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "03f6a261f3b4d7c24014f2026b09ad409076c566b39b99b8e0a7196f391caec508"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703214638,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json b/token-core/test-data/wallets-ios-2_14_1/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json
new file mode 100644
index 00000000..5662cc02
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json
@@ -0,0 +1,36 @@
+{
+  "id": "4d5cbfcf-aee1-4908-9991-9d060eb68a0e",
+  "version": 11001,
+  "keyHash": "3a9e72763fa0c09fe692054b9394d2f0855d99b6",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "bb7bd7ad553993efe60ad4d7eba02cc7" },
+    "ciphertext": "e5d4efb36ef52b0b81934764072d010d05a90baa9e5927afc0f1342d49f570a2",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "aaeb5d3f08de7705e4879687804d620cd4d1ad6a6c66bdaf8b258ff3ed960d31"
+    },
+    "mac": "c8ad29fef073f40f8c46fd74e589f1de40365563830cc962bd630f626a815538"
+  },
+  "activeAccounts": [
+    {
+      "address": "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz",
+      "derivationPath": "",
+      "curve": "ED25519",
+      "coin": "TEZOS",
+      "network": "MAINNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215567,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/60573d8d-8e83-45c3-85a5-34fbb2aad5e1 b/token-core/test-data/wallets-ios-2_14_1/60573d8d-8e83-45c3-85a5-34fbb2aad5e1
new file mode 100644
index 00000000..18323e1b
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/60573d8d-8e83-45c3-85a5-34fbb2aad5e1
@@ -0,0 +1,32 @@
+{
+  "imTokenMeta": {
+    "backup": [],
+    "version": "iOS-2.14.1.1742",
+    "mode": "normal",
+    "source": "KEYSTORE",
+    "segWit": "NONE",
+    "name": "Imported 2",
+    "timestamp": "1703213710.762331",
+    "chain": "ETHEREUM",
+    "passwordHint": ""
+  },
+  "id": "60573d8d-8e83-45c3-85a5-34fbb2aad5e1",
+  "version": 3,
+  "address": "02c98f4ed8c8aab1aaba46539e45070a02e416c0",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "21cca31acb4b3ec6824e7209f316d7ca"
+    },
+    "kdfparams": {
+      "dklen": 32,
+      "n": 8192,
+      "p": 1,
+      "r": 8,
+      "salt": "375c44fe7e9f97e1890500dd57327e3ba622ef4af42fa95e0cb099d88d93de2a"
+    },
+    "kdf": "scrypt",
+    "ciphertext": "9b62a4c07c96ca9b0b82b5b5eae4e7c9b2b7db531a6d2991198eb6809a8c35ac",
+    "mac": "f14170589220a51692b64c859ce1e276b832208ea5816dfd37db0a1599b67ddc"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/6c20aab6-1596-456d-9749-212e6139c5ed b/token-core/test-data/wallets-ios-2_14_1/6c20aab6-1596-456d-9749-212e6139c5ed
new file mode 100644
index 00000000..f1fa49e2
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/6c20aab6-1596-456d-9749-212e6139c5ed
@@ -0,0 +1,39 @@
+{
+  "xpub": "tpubDC8AkaytytTPrkUaPZpwL1NiRqr93MvGYHP75uQPMtyV9GXyB4hfJ4T7YU3RqXogUCHgvRn7EgePAogxhrPtser2KX3bN1YJBFRZVxhtGNV",
+  "mnemonicPath": "m/49'/1'/0'",
+  "imTokenMeta": {
+    "timestamp": "1703214806.924619",
+    "name": "Imported 7",
+    "segWit": "P2WPKH",
+    "backup": [],
+    "version": "iOS-2.14.1.1742",
+    "chain": "BITCOIN",
+    "source": "MNEMONIC",
+    "network": "TESTNET",
+    "passwordHint": "",
+    "mode": "normal"
+  },
+  "address": "2ND3WGu69ULLWJ3XcmtLyGswSUdbycFjngN",
+  "crypto": {
+    "ciphertext": "a86f985a707d2871d6802027f5cf943e1b66f99ebbb007032c95f721af4e531ed365fb705e15263bcce6aaec68bafc4a46c2f4bc8e83ab24946e6c645425f0743747f47792f55e0c1df573987c0a9d791bf5b95c5265e6bd99c353804c81f3658518bf7d034c1a15aa77435b8a6c95",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "salt": "6c528887c1a3a856c40bb3f87c7ca0091bcfbe01635ab69137554e0c54dcad42",
+      "p": 1
+    },
+    "mac": "a3f9c6f3cf0588dd335d0db6d5e00d8ca0a1942ceb1d31af2c1b94db7b05c28e",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "20f16d3a33fbe4abdcb1bcb0f839fcb4"
+    }
+  },
+  "encMnemonic": {
+    "nonce": "1ec1cbae4075893940fdad972870bd24",
+    "encStr": "dc53ccd9eadce8fac95f9f8551d5563609d5318687f3c24cf17eafa46976d18759f40044780d6f3e51126d13475b60b7868bb97183f73cb2fe97e9182aee6a7163540aa520ea8f0debec"
+  },
+  "version": 44,
+  "id": "6c20aab6-1596-456d-9749-212e6139c5ed"
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/6c3eae60-ad03-48db-a5e5-61a6f72aef8d b/token-core/test-data/wallets-ios-2_14_1/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
new file mode 100644
index 00000000..3f086a2f
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
@@ -0,0 +1,67 @@
+{
+  "encMnemonic": {
+    "encStr": "476ee81e62675ffb5e727f8e3f15f0222ff084bd4b064089d7a8397efe10bde265d965b214171f9e946128c7855cf53866b753021f6df8bd49b92bdb2caed5b8f618667177eaa5594933",
+    "nonce": "b553ebb7521eb1a9aa7d8738811ab102"
+  },
+  "keyPathPrivates": [
+    {
+      "derivedMode": "HD_SHA256",
+      "path": "",
+      "publicKey": "EOS7tpXQ1thFJ69ZXDqqEan7GMmuWdcptKmwgbs7n1cnx3hWPw3jw",
+      "privateKey": {
+        "encStr": "e44fc17b5bedd1f3409c07c84067f4d8af051b6edf72bfda4a4306f00f87cbde",
+        "nonce": "5485ffc4230fa0d389dde221ec22a0e2"
+      }
+    },
+    {
+      "privateKey": {
+        "encStr": "4267397725dda86d8a45079d7246fac0784c75494308cd8f5c5f157d74ce3a65",
+        "nonce": "d2f0a53208b5ddbda3e3c1808e92c64c"
+      },
+      "derivedMode": "HD_SHA256",
+      "publicKey": "EOS5SxZMjhKiXsmjxac8HBx56wWdZV1sCLZESh3ys1rzbMn4FUumU",
+      "path": ""
+    },
+    {
+      "privateKey": {
+        "nonce": "dae366211338af8bcc01610b0358b78e",
+        "encStr": "622c4a67b70c3e1fb33653dc56dc961cd8b4185252f31dceebab15a98e77f361"
+      },
+      "publicKey": "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+      "path": "m/44'/194'/0'/0/0",
+      "derivedMode": "PATH_DIRECTLY"
+    }
+  ],
+  "mnemonicPath": "m/44'/194'/0'/0/0",
+  "id": "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+  "version": 10001,
+  "crypto": {
+    "kdf": "scrypt",
+    "kdfparams": {
+      "salt": "43800be9d3459b3ce9b61826555165d5706a2e8ecfceb9e4b1fa341d743f5e60",
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "p": 1
+    },
+    "mac": "50a4fdbb20dc1a860ac93134e9edf15267f9f1a2443c4a329841bc17553758a9",
+    "cipherparams": {
+      "iv": "ac19624cfcb3cd32bd092ddf73aa6157"
+    },
+    "ciphertext": "7cd696ce21680fb9b02c326ec0563b05",
+    "cipher": "aes-128-ctr"
+  },
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "segWit": "NONE",
+    "mode": "normal",
+    "backup": [],
+    "timestamp": "1703213102.143412",
+    "source": "RECOVERED_IDENTITY",
+    "name": "EOS",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "EOS"
+  },
+  "address": ""
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/792a0051-16d7-44a7-921a-9b4a0c893b8f b/token-core/test-data/wallets-ios-2_14_1/792a0051-16d7-44a7-921a-9b4a0c893b8f
new file mode 100644
index 00000000..09a51f7a
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/792a0051-16d7-44a7-921a-9b4a0c893b8f
@@ -0,0 +1,38 @@
+{
+  "id": "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+  "mnemonicPath": "m/44'/60'/0'/0/1",
+  "encMnemonic": {
+    "nonce": "27d0fbb70bd03ce0e96824c0f88bb6ad",
+    "encStr": "b8e34c4ff5ee92f80cd893244c89be1ad75614550b4fde40eb81a214c4676623ec5f92076f495dc3204ab06533cccabbb218b01fbaa47255b56d7c17543aa3462d2f246169fb3377e422"
+  },
+  "imTokenMeta": {
+    "source": "MNEMONIC",
+    "passwordHint": "",
+    "backup": [],
+    "chain": "ETHEREUM",
+    "mode": "normal",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "version": "iOS-2.14.1.1742",
+    "timestamp": "1703217176.7788029",
+    "name": "Imported 12"
+  },
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "kdf": "scrypt",
+    "ciphertext": "a3f81f417cf96399c178fd18c058cf0cdc1023116e293c3c6fe5aa8a58f972f9",
+    "mac": "42f62a4647194f4efe78a07e8517ef9f4974b4bfb71524ed8dc8282f36780ce5",
+    "kdfparams": {
+      "salt": "59663950940345f9e69183f11f74319db35646ae7cd5be2f9f9bc478c07b4f1e",
+      "n": 262144,
+      "dklen": 32,
+      "r": 8,
+      "p": 1
+    },
+    "cipherparams": {
+      "iv": "4f64c9458e04b387dad5c7d0eaab8c91"
+    }
+  },
+  "address": "7152bcad819b084d57179e293d2765ffa0109e04",
+  "version": 3
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/949bada8-776c-4554-ad0c-001e3726a0f8.json b/token-core/test-data/wallets-ios-2_14_1/949bada8-776c-4554-ad0c-001e3726a0f8.json
new file mode 100644
index 00000000..2357d8d8
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/949bada8-776c-4554-ad0c-001e3726a0f8.json
@@ -0,0 +1,36 @@
+{
+  "id": "949bada8-776c-4554-ad0c-001e3726a0f8",
+  "version": 11001,
+  "keyHash": "53753cac330199ee8781a98ea425c4e3269fafb3",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "7be4c9889632aa4606629b8a4ac9ea3a" },
+    "ciphertext": "7577539a2457fb55203efb4dd876d048b4e60c087ec256836b1a37665a93869e47c178c7d65a3adf298405968eb98335e81f9d34480890a23a3750688ba2c6a9",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "0dc1086c96903786a838cb107bd4c726dd5d2e84527eadf73810c7ca846c1ef1"
+    },
+    "mac": "39df9379fd9711cb674fa7db48d5d7e451e0e9910b94bdd437f05a24684f180a"
+  },
+  "activeAccounts": [
+    {
+      "address": "FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "KUSAMA",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "74c6c052c7c31523e52d3f7f810d2549eff08921f98f207815ef49fb94758157"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "test account",
+    "passwordHint": "",
+    "timestamp": 1703215112,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/9b696367-69c1-4cfe-8325-e5530399fc3f b/token-core/test-data/wallets-ios-2_14_1/9b696367-69c1-4cfe-8325-e5530399fc3f
new file mode 100644
index 00000000..07cd1aa6
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/9b696367-69c1-4cfe-8325-e5530399fc3f
@@ -0,0 +1,38 @@
+{
+  "encMnemonic": {
+    "nonce": "2008d58e51c5404c3c40b9356367b4aa",
+    "encStr": "15f43fbbcedea68eed7366c97978590c4c967c241eccf04ec262037c19e5b674da17af29ccb3c1a20d8ee329f093664f6946a3a4c7a7d14dba6ac57d6ba8930c541397ed1726ba1bb1ce"
+  },
+  "crypto": {
+    "kdfparams": {
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "salt": "baa68d0f96f49b047c284534d840950ceb819f84b88c5a416b4d5b9ea17f5aa8",
+      "p": 1
+    },
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "4f0e3646ec292b97862ef9d3591266d40afe2d262478a50da4fc101e8063cac8",
+    "mac": "8e8b0cd5f92eee4934bbdc9ff14be7800f9a612e34bb8e6a868ece82485a35d1",
+    "cipherparams": {
+      "iv": "30845f11343a0cde4c4d51f46d700f24"
+    }
+  },
+  "imTokenMeta": {
+    "version": "iOS-2.14.1.1742",
+    "name": "Imported 4",
+    "source": "MNEMONIC",
+    "chain": "COSMOS",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "timestamp": "1703214474.4959989",
+    "passwordHint": "",
+    "mode": "normal",
+    "backup": []
+  },
+  "mnemonicPath": "m/44'/118'/0'/0/0",
+  "address": "cosmos1m566v5rcklnac8vc0dftfu4lnvznhlu7d3f404",
+  "version": 3,
+  "id": "9b696367-69c1-4cfe-8325-e5530399fc3f"
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3 b/token-core/test-data/wallets-ios-2_14_1/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3
new file mode 100644
index 00000000..9b83d4c1
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3
@@ -0,0 +1,39 @@
+{
+  "mnemonicPath": "m/44'/1'/0'",
+  "encMnemonic": {
+    "nonce": "2ee95dd0261dec2a1a169711fc6b122b",
+    "encStr": "5a67693dbeff1c5fe5dc8a4452971ab6716ae7c6b228408611492e61fa743a925b85f27de9bb2060fb7399d406c83974e408ac2a727cda382ea62b8686cd80bbc551e320ba2e8581edd0"
+  },
+  "xpub": "tpubDDLWiBeq9RLDQinYZUJueQBmT4bnY6Tbcsijqb4FgC7ZFifnt3ioiQRvuokYQTqBbLxxpYspFFgS1TAoXxdFBbzhkGFNdKaCRfcXK4sGxcC",
+  "version": 44,
+  "id": "9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3",
+  "imTokenMeta": {
+    "mode": "normal",
+    "network": "TESTNET",
+    "name": "Imported 3",
+    "version": "iOS-2.14.1.1742",
+    "timestamp": "1703213844.307544",
+    "source": "MNEMONIC",
+    "passwordHint": "",
+    "backup": [],
+    "segWit": "NONE",
+    "chain": "BITCOIN"
+  },
+  "address": "myRzNZ88RxzC14V8RDunAP3cx7dyXBFqmA",
+  "crypto": {
+    "kdf": "scrypt",
+    "kdfparams": {
+      "n": 262144,
+      "salt": "0514aba594970e5fe70a169f0710fbb1d34cddae600bc4c6920fcfa95bc0e9b2",
+      "r": 8,
+      "p": 1,
+      "dklen": 32
+    },
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "6de42c00f0a943bbfd8ac38381538268"
+    },
+    "mac": "97f8618e31d6c5e5cd38df78f98466790e44fa7026c077cf6ff60336007b4a80",
+    "ciphertext": "ce067661784ead67f410e26b1fde72012cd2f3db62723597b3a32ffe5075d68ed19bef458f89165b9404be1651a6ecdf87def7455982504e4e9b26901589cde2fdc2c3e55a3e3b0d414ec1dc37f9f9db8b2d2e5704a3f20a25dd08066f94c20ddc670ece8d5f49fa57d877844eed6a"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/9f4acb4a-7431-4c7d-bd25-a19656a86ea0 b/token-core/test-data/wallets-ios-2_14_1/9f4acb4a-7431-4c7d-bd25-a19656a86ea0
new file mode 100644
index 00000000..bd3c72c4
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/9f4acb4a-7431-4c7d-bd25-a19656a86ea0
@@ -0,0 +1,33 @@
+{
+  "address": "3PwFUt9EgTkXzJh4cMoQroJZsVSf3w65mN",
+  "id": "9f4acb4a-7431-4c7d-bd25-a19656a86ea0",
+  "crypto": {
+    "cipherparams": {
+      "iv": "547e736a7696c1d5042f2a326448dcad"
+    },
+    "cipher": "aes-128-ctr",
+    "ciphertext": "177f8e5b38357562e363c93a5a724233b35271f34c102bb3bab11ce95b93464eff03e3a5b8339e5b1a0547d1a88373886b1f5763",
+    "kdf": "scrypt",
+    "mac": "965e49c4bdacfd3d82a9ddba7444980983a1d4bb2a3df473a2ed07207385b656",
+    "kdfparams": {
+      "dklen": 32,
+      "n": 262144,
+      "r": 8,
+      "p": 1,
+      "salt": "07722d61dd3a5973edec8b20b0cb8c88685f26784f7cb2608a3f6d9528b7a6b9"
+    }
+  },
+  "imTokenMeta": {
+    "name": "Imported 13",
+    "network": "MAINNET",
+    "passwordHint": "",
+    "source": "WIF",
+    "timestamp": "1703226722.868754",
+    "version": "iOS-2.14.1.1742",
+    "mode": "normal",
+    "backup": [],
+    "chain": "BITCOIN",
+    "segWit": "P2WPKH"
+  },
+  "version": 3
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/a7294912-b24f-44ba-86c1-48d76117808a.json b/token-core/test-data/wallets-ios-2_14_1/a7294912-b24f-44ba-86c1-48d76117808a.json
new file mode 100644
index 00000000..064c686d
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/a7294912-b24f-44ba-86c1-48d76117808a.json
@@ -0,0 +1,36 @@
+{
+  "id": "a7294912-b24f-44ba-86c1-48d76117808a",
+  "version": 11001,
+  "keyHash": "4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "ac82e8975bca06eaeb5932db660909f3" },
+    "ciphertext": "7a703585ece09a10aa033b5f86d499f8b315d021a751ff32ff916f7b462d6299",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "a56738f29a6c41334e6a6d77dd45a80166bfc2b3799081e747303e7f6575b759"
+    },
+    "mac": "5d3ecd2a523ebca45e86cc935a81cb86e148e422bc5c53cb9e02664e56418900"
+  },
+  "activeAccounts": [
+    {
+      "address": "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215494,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/ac59ccc1-285b-47a7-92f5-a6c432cee21a b/token-core/test-data/wallets-ios-2_14_1/ac59ccc1-285b-47a7-92f5-a6c432cee21a
new file mode 100644
index 00000000..97afd8cc
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/ac59ccc1-285b-47a7-92f5-a6c432cee21a
@@ -0,0 +1,38 @@
+{
+  "address": "cosmos1ajz9y0x3wekez7tz2td2j6l2dftn28v26dd992",
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "timestamp": "1703213078.483429",
+    "passwordHint": "",
+    "mode": "normal",
+    "name": "COSMOS",
+    "chain": "COSMOS",
+    "segWit": "NONE",
+    "backup": [],
+    "version": "iOS-2.14.1.1742",
+    "source": "RECOVERED_IDENTITY"
+  },
+  "encMnemonic": {
+    "encStr": "c8e9fd75dc1a95c7130e30bfbde8a384fe0fc91693cec3aff2529b93a7696cf3b22745f8de96cabbfc63ec31c33cd2de8ce2ec96870dd383d7e13f131272e7a3c358eeb46a36538b0720",
+    "nonce": "15da4b89ec152eb85702e0f596058f52"
+  },
+  "id": "ac59ccc1-285b-47a7-92f5-a6c432cee21a",
+  "crypto": {
+    "kdfparams": {
+      "p": 1,
+      "dklen": 32,
+      "n": 262144,
+      "r": 8,
+      "salt": "14599065a6ad64c42670524f136f4ceacdf72bb7e1b253e2ed56cb4f96e991be"
+    },
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "c029f75712fd6555cd0b30bfa2644454"
+    },
+    "kdf": "scrypt",
+    "ciphertext": "d8bfd56edf4b7270a98ab71c48e0f6ae7f9897859740cfcd57fe4e2415629e62",
+    "mac": "4faea2527d04bfc9edc302875923deadf61113e849b36dfad8ad18d34eb38c63"
+  },
+  "mnemonicPath": "m/44'/118'/0'/0/0",
+  "version": 3
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/d9e3bb9c-87fd-4836-b146-10a3e249eb75 b/token-core/test-data/wallets-ios-2_14_1/d9e3bb9c-87fd-4836-b146-10a3e249eb75
new file mode 100644
index 00000000..5daec43a
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/d9e3bb9c-87fd-4836-b146-10a3e249eb75
@@ -0,0 +1,33 @@
+{
+  "version": 3,
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "name": "Imported 14",
+    "version": "iOS-2.14.1.1742",
+    "source": "WIF",
+    "passwordHint": "",
+    "timestamp": "1703226797.333446",
+    "backup": [],
+    "chain": "BITCOIN",
+    "segWit": "NONE",
+    "mode": "normal"
+  },
+  "id": "d9e3bb9c-87fd-4836-b146-10a3e249eb75",
+  "address": "1962gsZ8PoPUYHneFakkCTrukdFMVQ4i4T",
+  "crypto": {
+    "cipherparams": {
+      "iv": "15f5b149172c5f96fc4eb4c2c618b9fe"
+    },
+    "ciphertext": "4a916ea2fbf9156f1f179ac94dc5f99ba2ed7b9d7841fb9e4271af38fdac9d349368e89c929604ce6987077a7d12e451842513dd",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "mac": "2061aad7f9165828873e04c7db581d5d60c36eba328940b18cc589a6df6095a2",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "p": 1,
+      "salt": "4db39bbbfed6027055eaaa0b92ea4c97b2476f368f70ec8f93a6be3a5cfb2747"
+    }
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/f3615a56-cb03-4aa4-a893-89944e49920d b/token-core/test-data/wallets-ios-2_14_1/f3615a56-cb03-4aa4-a893-89944e49920d
new file mode 100644
index 00000000..93f3823c
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/f3615a56-cb03-4aa4-a893-89944e49920d
@@ -0,0 +1,33 @@
+{
+  "version": 3,
+  "imTokenMeta": {
+    "name": "Imported 1",
+    "backup": [],
+    "passwordHint": "",
+    "source": "PRIVATE",
+    "timestamp": "1703213241.0374532",
+    "version": "iOS-2.14.1.1742",
+    "mode": "normal",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "chain": "ETHEREUM"
+  },
+  "id": "f3615a56-cb03-4aa4-a893-89944e49920d",
+  "crypto": {
+    "kdf": "scrypt",
+    "ciphertext": "bd9ed0988742c678f6b1a6a05233c08a00f438b2c62ff2f024abe32527886e3b",
+    "mac": "a606524699adc9419400e18440e1b13e3b727263f13548846ba1a0d6025c2124",
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "e173367006b5bf571351d0f1b2aad303"
+    },
+    "kdfparams": {
+      "dklen": 32,
+      "n": 262144,
+      "r": 8,
+      "p": 1,
+      "salt": "152db1481a9478809729a18236cd85068bbaa32a02da5495500993fd0d871ea2"
+    }
+  },
+  "address": "80427ae1f55bcf60ee4cd2db7549b8bc69a74303"
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json b/token-core/test-data/wallets-ios-2_14_1/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json
new file mode 100644
index 00000000..7fafac49
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json
@@ -0,0 +1,36 @@
+{
+  "id": "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb",
+  "version": 11001,
+  "keyHash": "e0d650a880f2cbbd8302483a06939cd3431592d8",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "6d9df1458a23ac4408aae9fa5b643210" },
+    "ciphertext": "4ad73446865c2e3d192378c2eabac647a48843ec4f553357b5533933752c06e8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "cacea0da408ce9d6f70a909602c23c87eb970490ccc4e06d7d80b4cf5ad67287"
+    },
+    "mac": "0dac456a4572a859e2dacc378435c401e2f1dddaa3191154b8f5f775f498a709"
+  },
+  "activeAccounts": [
+    {
+      "address": "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa",
+      "derivationPath": "",
+      "curve": "BLS",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "80f0d9dfb26b6c66254fd6663f4cbe39c4ca46e54f779c2e30c618fb57350e5b7f55b51c16e04c9d2550f3b731551ed7"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215416,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets-ios-2_14_1/identity.json b/token-core/test-data/wallets-ios-2_14_1/identity.json
new file mode 100644
index 00000000..ecab78d3
--- /dev/null
+++ b/token-core/test-data/wallets-ios-2_14_1/identity.json
@@ -0,0 +1,54 @@
+{
+  "imTokenMeta": {
+    "network": "TESTNET",
+    "name": "identity_name",
+    "version": "iOS-2.14.1.1742",
+    "source": "RECOVERED_IDENTITY",
+    "passwordHint": "",
+    "timestamp": "1703213073.8432422",
+    "backup": [],
+    "segWit": "P2WPKH",
+    "mode": "normal"
+  },
+  "version": 10000,
+  "walletIds": [
+    "0597526e-105f-425b-bb44-086fc9dc9568",
+    "00fc0804-7cea-46d8-9e95-ed1efac65358",
+    "ac59ccc1-285b-47a7-92f5-a6c432cee21a",
+    "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+    "f3615a56-cb03-4aa4-a893-89944e49920d",
+    "60573d8d-8e83-45c3-85a5-34fbb2aad5e1",
+    "9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3",
+    "9b696367-69c1-4cfe-8325-e5530399fc3f",
+    "6c20aab6-1596-456d-9749-212e6139c5ed",
+    "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+    "9f4acb4a-7431-4c7d-bd25-a19656a86ea0",
+    "d9e3bb9c-87fd-4836-b146-10a3e249eb75"
+  ],
+  "crypto": {
+    "cipherparams": { "iv": "b947b2ece06b648a75187dcddee67cc1" },
+    "ciphertext": "5f1cbaef883def74b4b27a64586188da00f020f9611d1efc84dffba5ae31a173962e2196589aa66a065e5e0f929b26eac27ca04c8eecc0727f5f91e0038cf6aaba9d827c76c6f225ceaa9d937c3a3f1a958e5fe74585565175d301ead8a67f401250abcd0e832f76a4ed37628170b6",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "mac": "deeabc0d49e9b2ec0eb97d55cff25e2c14ff74e257c96145fb8e47bc31d8df26",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "p": 1,
+      "salt": "b0fdfcb67bdfc6461d907f6b55c364ce98e21057b74df586953e2bc6e293c248"
+    }
+  },
+  "encMnemonic": {
+    "encStr": "74c4b82c2af67c35b8ff31c3547a705d94f9a66397f1aa4118eb6450ec140f055117ec2a87a4402069a3837db7d1b20d16e4e1b9b93c6b615c739b833bd9cb20148c6c37efd777fb6b30",
+    "nonce": "a293778a4eec6fdd6f7c7ac0edcd869f"
+  },
+  "encAuthKey": {
+    "encStr": "628e9f0926f12abed0c201bc605af2a378a72cbc397c182c270888ca7dad4d1f",
+    "nonce": "93e5aff1a87c6f3be9b5bef506478dae"
+  },
+  "id": "d5017486-f9b2-4aeb-8f7b-c57da9b77668",
+  "identifier": "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg",
+  "ipfsId": "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU",
+  "encKey": "9513617c9b398edebfb46080a8f0cf6cab6763866bb06daa63503722bea78907"
+}
diff --git a/token-core/test-data/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358 b/token-core/test-data/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358
new file mode 100644
index 00000000..cab57d2b
--- /dev/null
+++ b/token-core/test-data/wallets/00fc0804-7cea-46d8-9e95-ed1efac65358
@@ -0,0 +1,39 @@
+{
+  "address": "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB",
+  "imTokenMeta": {
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": "1703213076.948025",
+    "backup": [],
+    "mode": "normal",
+    "name": "BTC",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "BITCOIN",
+    "network": "TESTNET",
+    "segWit": "P2WPKH"
+  },
+  "id": "00fc0804-7cea-46d8-9e95-ed1efac65358",
+  "encMnemonic": {
+    "nonce": "406c972f073ebf5b9102d262e6713408",
+    "encStr": "76b940d06641023f995cffde6ee9c4bc7c063a780897b5debd619aafc769b37db684eafb10dd48c3c3cbcb810952bb4455984fde5aa34a1dfb4d5ad93293c0d3f3a78124639a4530b4c2"
+  },
+  "xpub": "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv",
+  "crypto": {
+    "kdfparams": {
+      "dklen": 32,
+      "r": 8,
+      "salt": "8fac63b4cc6d75817269a380bc8107572ecba3a8fe1ab87e46e30ab696ce2320",
+      "p": 1,
+      "n": 262144
+    },
+    "mac": "6daa39ee727416a135b02d6183c71624de0b7cf74fb3a3d1562488e66f308c76",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "cdde8cafd9eff3f9715ef40577913e2ded3b8a9f009781d3367e4a1b02e95894c45ab6ef2658e7ef99b8437cba0f05f5c12caca60e97745b71581075f086a57afac8f626f3d2f7c94813edb6eb26b5cf8147fd32419a3abc762d71dc2be77d555cb75e983a74fa45f7b08e59ce7945",
+    "cipherparams": {
+      "iv": "a575c61a89577eea45af32df6aa4005a"
+    },
+    "kdf": "scrypt"
+  },
+  "version": 44,
+  "mnemonicPath": "m/49'/1'/0'"
+}
diff --git a/token-core/test-data/wallets/0597526e-105f-425b-bb44-086fc9dc9568 b/token-core/test-data/wallets/0597526e-105f-425b-bb44-086fc9dc9568
new file mode 100644
index 00000000..c3bb060d
--- /dev/null
+++ b/token-core/test-data/wallets/0597526e-105f-425b-bb44-086fc9dc9568
@@ -0,0 +1,38 @@
+{
+  "address": "6031564e7b2f5cc33737807b2e58daff870b590b",
+  "encMnemonic": {
+    "nonce": "2965662f34c72c81a88c1db2aca114b4",
+    "encStr": "ddd91dd4d10cf6baf95ca5feac29936e687d2053af23c286acfac9aecab28d27b9035b561da5c779fa46793ea04ea227f8021fba29588470324efbfece7bd32485285a26a847c17fa84c"
+  },
+  "id": "0597526e-105f-425b-bb44-086fc9dc9568",
+  "mnemonicPath": "m/44'/60'/0'/0/0",
+  "imTokenMeta": {
+    "name": "ETH",
+    "chain": "ETHEREUM",
+    "version": "iOS-2.14.1.1742",
+    "network": "MAINNET",
+    "backup": [],
+    "segWit": "NONE",
+    "timestamp": "1703213075.42502",
+    "passwordHint": "",
+    "mode": "normal",
+    "source": "RECOVERED_IDENTITY"
+  },
+  "crypto": {
+    "ciphertext": "17ab523c759dbcf3104dc3e3b69b8b2c7f188bf8379af98257d2fec06688402a",
+    "kdf": "scrypt",
+    "mac": "97f5ed556e84a95422de0d85ba17b71320c91d203b6a42214e151bcf40cdf0de",
+    "cipherparams": {
+      "iv": "3a95e7bb685f2873efba577839ea8915"
+    },
+    "kdfparams": {
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "p": 1,
+      "salt": "4f84c01e3fdbaac75feff106bea17dde9d9f7cc3db05043664e958fe50f2ed05"
+    },
+    "cipher": "aes-128-ctr"
+  },
+  "version": 3
+}
diff --git a/token-core/test-data/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json b/token-core/test-data/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
new file mode 100644
index 00000000..b0e2ffdc
--- /dev/null
+++ b/token-core/test-data/wallets/0a2756cd-ff70-437b-9bdb-ad46b8bb0819.json
@@ -0,0 +1,106 @@
+{
+  "id": "0a2756cd-ff70-437b-9bdb-ad46b8bb0819",
+  "version": 11000,
+  "keyHash": "512115eca3ae86646aeb06861d551e403b543509",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "acc1209c400cfff80668e9a36ef8a2e5" },
+    "ciphertext": "033964aa3253c904f50b3798a14299802765ddd84ffa7b699e24ee531076ab6256682a45c8f4c9a4c98f202e5791f5061833d3936fc9f12728d1658ea6bb49fac38e577861981a5e5d43",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "4fba99988c8eec256f138e1f5e098b03d91461b8969544878f315343f42d1e5f"
+    },
+    "mac": "d94cca35619e88fccdc6778b8c0c5691fe163378b02cf32ec3e6afbe0ce5ff05"
+  },
+  "activeAccounts": [
+    {
+      "address": "TY2uroBeZ5trA9QT96aEWj32XLkAAhQ9R2",
+      "derivationPath": "m/44'/195'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "TRON",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "037e39800880000000988ebb67dc6f173948ccaed62dd3c4b60fea66a4280da93eed971b55d4e6e9c203349ff19e96c1aa7f568e493f85fa506320410245b4e69146bb0d3d8b5df3b901",
+      "publicKey": "037b5253c24ce2a293566f9e066051366cda5073e4a43b25f07c990d7c9ac0aab5"
+    },
+    {
+      "address": "ckt1qyqtr684u76tu7r8efkd24hw8922xfvhnazskzdzy6",
+      "derivationPath": "m/44'/309'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "NERVOS",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "03b4fb97788000000048c75f39fe91ddfe4a0e6ef2fa53795a006e0e78f06b1af7d2b107ea3cefe22903ad9d0e2d9181e23c7075a56ed4f10e249aaf38a2bb7aa0cb604f8b768ea84b86",
+      "publicKey": "03554851980004ff256888612bf0d64d9b1002bf82331450fd5a7405d1b23cc5bd"
+    },
+    {
+      "address": "qqurlwqukz3lcujttcyvlzaagppnd4c37chrtrylmc",
+      "derivationPath": "m/44'/1'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "BITCOINCASH",
+      "network": "TESTNET",
+      "segWit": "NONE",
+      "extPubKey": "036c2b38ad8000000023332f38a77023d3c1a450499c8aeb3db2e666aa2cc6fff7db6797c5d2aef8fc036663443d71127b332c68cd6bffb6c2b5eb4dc6861404ed055dc36a25b8c18020",
+      "publicKey": "033d710ab45bb54ac99618ad23b3c1da661631aa25f23bfe9d22b41876f1d46e4e"
+    },
+    {
+      "address": "myxdgXjCRgAskD2g1b6WJttJbuv67hq6sQ",
+      "derivationPath": "m/44'/2'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "LITECOIN",
+      "network": "TESTNET",
+      "segWit": "NONE",
+      "extPubKey": "03bd0b1c14800000003bd4b941a0eebb0bfa4c3324bb77f0a1643aa80d112e2a6d48187c1b333a3d2d02c7709248e6205fefa7366efb0269021f1f2f1e04fdc334fe7c7fd2628d7451e8",
+      "publicKey": "0289ca41680edbc5594ee6378ebd937e42cd6b4b969e40dd82c20ef2a8aa5bad7b"
+    },
+    {
+      "address": "JHBkzZJnLZ3S3HLvxjpFAjd6ywP7WAk5miL7MwVCn9a7jHS",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "KUSAMA",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"
+    },
+    {
+      "address": "16hsF1UW1kob7vUR7tymVNCmp1eo18uhhtc4szetH4xbYpbd",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "POLKADOT",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "fc581c897af481b10cf846d88754f1d115e486e5b7bcc39c0588c01b0a9b7a11"
+    },
+    {
+      "address": "t12i3bop43tprlnymx2c75u6uvlq7iur2rcd7qsey",
+      "derivationPath": "m/44'/461'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "03d2bab08e80000000b2045e43ef88287b28ca49251d4fdc5e2810b1340e7e1be6fe3f8e968c33e4fd02611325073f61ae5feb6c8dce96857d007cdb765937e53e43e6f91374dac62edb",
+      "publicKey": "03bd460186d29fd9ac68ee88b110c3acc4a4443648a1ec7607af9ce306ad76f785"
+    },
+    {
+      "address": "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz",
+      "derivationPath": "m/44'/1729'/0'/0'",
+      "curve": "ED25519",
+      "coin": "TEZOS",
+      "network": "MAINNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "tcx-wallet",
+    "passwordHint": "",
+    "timestamp": 1703213098,
+    "source": "MNEMONIC"
+  }
+}
diff --git a/token-core/test-data/wallets/0d49aae6-cf73-4ebb-998d-b6312d18361f.json b/token-core/test-data/wallets/0d49aae6-cf73-4ebb-998d-b6312d18361f.json
new file mode 100644
index 00000000..49c0ed6a
--- /dev/null
+++ b/token-core/test-data/wallets/0d49aae6-cf73-4ebb-998d-b6312d18361f.json
@@ -0,0 +1,40 @@
+{
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "271d0f7c2ed23dcd277bf45f39ae1efe" },
+    "ciphertext": "72a6f74eb61dfac8b2601146b95409e46903205e6e524593c1af4b665bed6a224a612129512357a4bce8bb19089e7f207bc3a8cfd927745d2956103b62954bb0331ed00d1d92abe69eaf8ec671ee794deacd8393307b0f91a604b6ec02470df8f9d120eeed1b838daa8764882de72c1f48fdc70460cc1508b4592296ef8cfcc1",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "bc21558b9645d3766b45c2bb154fdffb038cf85e444f0dcaf4d58c912831d1c9"
+    },
+    "mac": "6b909623c3b857880b694a38c5ef2dbcef03d7db13c4fc038fc682afc5feb16b"
+  },
+  "id": "0d49aae6-cf73-4ebb-998d-b6312d18361f",
+  "version": 10001,
+  "address": "imtoken2test",
+  "keyPathPrivates": [
+    {
+      "derivedMode": "IMPORTED",
+      "path": "",
+      "publicKey": "EOS6r37Sr3oDQNqcKDuSC5kzfu8bKs2jVidWDzA2MjBwhFuFfKkrz",
+      "privateKey": {
+        "encStr": "bf7045ee3694daf87e7bd6ecbf0fbf37d2d3c126a7ae305f6804b905c235ff0b",
+        "nonce": "cb797d96bd75d65fb547e29b1fa9df3e"
+      }
+    }
+  ],
+  "imTokenMeta": {
+    "backup": [],
+    "chainType": "EOS",
+    "mode": "NORMAL",
+    "name": "Imported 1",
+    "network": "MAINNET",
+    "passwordHint": "",
+    "source": "WIF",
+    "timestamp": 1709866517,
+    "walletType": "RANDOM"
+  }
+}
diff --git a/token-core/test-data/wallets/1bfddca9-84dc-4561-bbe9-844a9ff2b281 b/token-core/test-data/wallets/1bfddca9-84dc-4561-bbe9-844a9ff2b281
new file mode 100644
index 00000000..85a05f79
--- /dev/null
+++ b/token-core/test-data/wallets/1bfddca9-84dc-4561-bbe9-844a9ff2b281
@@ -0,0 +1,39 @@
+{
+  "address": "2MwN441dq8qudMvtM5eLVwC3u4zfKuGSQAB",
+  "imTokenMeta": {
+    "source": "RECOVERED_IDENTITY",
+    "timestamp": "1703213076.948025",
+    "backup": [],
+    "mode": "normal",
+    "name": "a clone of 00fc0804-7cea-46d8-9e95-ed1efac65358",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "BITCOIN",
+    "network": "TESTNET",
+    "segWit": "P2WPKH"
+  },
+  "id": "1bfddca9-84dc-4561-bbe9-844a9ff2b281",
+  "encMnemonic": {
+    "nonce": "406c972f073ebf5b9102d262e6713408",
+    "encStr": "76b940d06641023f995cffde6ee9c4bc7c063a780897b5debd619aafc769b37db684eafb10dd48c3c3cbcb810952bb4455984fde5aa34a1dfb4d5ad93293c0d3f3a78124639a4530b4c2"
+  },
+  "xpub": "tpubDCwNET9ErXmBracx3ZBfi6rXQZRjYkpitFe23FAW9M3RcCw4aveNC4SAV5yYrFDjtP3b46eFfv4VtiYP3EXoTZsbnJia2yNznExS8EEcACv",
+  "crypto": {
+    "kdfparams": {
+      "dklen": 32,
+      "r": 8,
+      "salt": "8fac63b4cc6d75817269a380bc8107572ecba3a8fe1ab87e46e30ab696ce2320",
+      "p": 1,
+      "n": 262144
+    },
+    "mac": "6daa39ee727416a135b02d6183c71624de0b7cf74fb3a3d1562488e66f308c76",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "cdde8cafd9eff3f9715ef40577913e2ded3b8a9f009781d3367e4a1b02e95894c45ab6ef2658e7ef99b8437cba0f05f5c12caca60e97745b71581075f086a57afac8f626f3d2f7c94813edb6eb26b5cf8147fd32419a3abc762d71dc2be77d555cb75e983a74fa45f7b08e59ce7945",
+    "cipherparams": {
+      "iv": "a575c61a89577eea45af32df6aa4005a"
+    },
+    "kdf": "scrypt"
+  },
+  "version": 44,
+  "mnemonicPath": "m/49'/1'/0'"
+}
diff --git a/token-core/test-data/wallets/20a9f050-7fd1-4f2c-b7f8-f03c78201f78.json b/token-core/test-data/wallets/20a9f050-7fd1-4f2c-b7f8-f03c78201f78.json
new file mode 100644
index 00000000..a49c1ba6
--- /dev/null
+++ b/token-core/test-data/wallets/20a9f050-7fd1-4f2c-b7f8-f03c78201f78.json
@@ -0,0 +1,44 @@
+{
+  "version": 10001,
+  "id": "20a9f050-7fd1-4f2c-b7f8-f03c78201f78",
+  "encMnemonic": { "encStr": "", "nonce": "" },
+  "address": "imtoken2test",
+  "keyPathPrivates": [
+    {
+      "path": "",
+      "derivedMode": "IMPORTED",
+      "privateKey": {
+        "encStr": "13670678526669a12be40e9068a9c6565a0a8e92899f04790aff4b9cd12f4c76",
+        "nonce": "e870f1a76b63415f0d41264e6355148f"
+      },
+      "publicKey": "EOS6r37Sr3oDQNqcKDuSC5kzfu8bKs2jVidWDzA2MjBwhFuFfKkrz"
+    }
+  ],
+  "imTokenMeta": {
+    "source": "WIF",
+    "backup": [],
+    "mode": "normal",
+    "chain": "EOS",
+    "timestamp": "1710142425.79249",
+    "passwordHint": "",
+    "version": "iOS-2.14.1.1742",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "name": "Imported 1"
+  },
+  "mnemonicPath": "",
+  "crypto": {
+    "kdfparams": {
+      "n": 262144,
+      "salt": "aa3be513f461fb24392618ef1ff2011b200c9766130fe872ea2b3816aef0eda8",
+      "p": 1,
+      "r": 8,
+      "dklen": 32
+    },
+    "mac": "bc3573343cd1a64e9e5f73c972c2d4772b63c838b871f406835984c737f91740",
+    "ciphertext": "12ea4c0653df8fe9e1bff6f6abd1cefb0df14ae50483c35a18f7ea6309edaaca303d7e8fd392baf4019ec0fcbd361c8f563c612dc067195043b9a7d78c1b3ff0083f72adc0556cbee8edf9afc13ba510af1b45a7a0f4cc813380e25cb98e699d22d79e603b92ab587badda5d1edb6aa7c58efa23726f071e22a4319f6d303370",
+    "kdf": "scrypt",
+    "cipherparams": { "iv": "3081c9838a2bf0f47ffab13e511f8988" },
+    "cipher": "aes-128-ctr"
+  }
+}
diff --git a/token-core/test-data/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json b/token-core/test-data/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json
new file mode 100644
index 00000000..63f43b27
--- /dev/null
+++ b/token-core/test-data/wallets/300b42bc-0948-4734-82cb-4293dfeeefd2.json
@@ -0,0 +1,36 @@
+{
+  "id": "300b42bc-0948-4734-82cb-4293dfeeefd2",
+  "version": 11000,
+  "keyHash": "dae3455556d5d8393bd6eab490f3fd826dea11d7",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "9d32a43c6b72fb2d2e4b2270710c8433" },
+    "ciphertext": "53a7b92e1e298aacb3d8a2c60af33bf32859cee2d864f96f224a2efb0e6cb9424c692465e7f16ac10658ed4f77112b1d1e6d4f0c70a330ede4a328ed0988e29ff98597ac16bf7024ecd8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "b75cf0eef6f8336496dd3ff6154ab722a48f257e0d722c279df44f59f50c4829"
+    },
+    "mac": "b7af11db0bc1017475cff76c66a8bd273d17ca8afc801cc455d8f6b5c04c09a2"
+  },
+  "activeAccounts": [
+    {
+      "address": "ckt1qyqgkffut7e7md39tp5ts9vxssj7wdw8z4cquyflka",
+      "derivationPath": "m/44'/309'/0'/0/0",
+      "curve": "SECP256k1",
+      "coin": "NERVOS",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "0388738aff800000002c2f44d1805be1ced7fc390a43385c492ba910f3423865d86ce16ea53689cd410371dcfc20fae2ed0020d5f4dc5ba5650b6a838fe3d0fc546c6a054ec54e8b46f6",
+      "publicKey": "0314ec66f9ba5135e15a6477cd0ac63b2ede974e085f5fb324f26b4bef8891da2c"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "Imported 6",
+    "passwordHint": "",
+    "timestamp": 1703214731,
+    "source": "MNEMONIC"
+  }
+}
diff --git a/token-core/test-data/wallets/46e8e653-dd05-4217-b225-faafc8451a2c.json b/token-core/test-data/wallets/46e8e653-dd05-4217-b225-faafc8451a2c.json
new file mode 100644
index 00000000..ba6c9c29
--- /dev/null
+++ b/token-core/test-data/wallets/46e8e653-dd05-4217-b225-faafc8451a2c.json
@@ -0,0 +1,36 @@
+{
+  "id": "46e8e653-dd05-4217-b225-faafc8451a2c",
+  "version": 11001,
+  "keyHash": "e74f1ec2f7d09b494c6679b24dc0379d0942084f",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "04e1ebd84e6f814197c98390321ebcd7" },
+    "ciphertext": "e8a4e34c0d8295d8df53edaf786ed46327aafa8cb12454f69ffe12e3a749e904",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "0d091a3c11a9e65a641b7e9eb5d19b6dcf814a4baea8219f1c57ac7a3283ea0c"
+    },
+    "mac": "64c31149419ae08e3c3bcb0e0b8195c19398af21017a4bde285b5a3f115c203b"
+  },
+  "activeAccounts": [
+    {
+      "address": "LavE5eHDvw9VDiNifbraR7GyY8MRvcQSLQ",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "LITECOIN",
+      "network": "MAINNET",
+      "segWit": "NONE",
+      "extPubKey": "",
+      "publicKey": "03d90fc13842832d95b599fde757c716982815d828f24ab7a76a9a15913ab9d8ec"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703226999,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/483cb13e-5e59-4428-a219-018de4ce60f6.json b/token-core/test-data/wallets/483cb13e-5e59-4428-a219-018de4ce60f6.json
new file mode 100644
index 00000000..dbae897c
--- /dev/null
+++ b/token-core/test-data/wallets/483cb13e-5e59-4428-a219-018de4ce60f6.json
@@ -0,0 +1,36 @@
+{
+  "id": "483cb13e-5e59-4428-a219-018de4ce60f6",
+  "version": 11001,
+  "keyHash": "857768c6e939731056de55f93ac8dd084dfa7495",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "aa8a78aed3e97d248a4e3bf9b59e199b" },
+    "ciphertext": "7718a2d0f422d519984e386c818a39f36cf0eb36175e3a899c5e4385fe51637f",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "3bb181ab7ef0e6a39d21852529a141789e48ff898e54178a69aa0bb9639ea601"
+    },
+    "mac": "c52c0f60943b8db9111e23e73e26f1dc699de10dbca65852510488925ed47546"
+  },
+  "activeAccounts": [
+    {
+      "address": "qpvtgl4r5h4mexvme0w59xunuzfnzkq585cj4skrp4",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "BITCOINCASH",
+      "network": "MAINNET",
+      "segWit": "NONE",
+      "extPubKey": "",
+      "publicKey": "024fb7df3961e08f01025e434ea19708a4317d2fe59775cddd38df6e8a2d30697d"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703226876,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json b/token-core/test-data/wallets/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json
new file mode 100644
index 00000000..e3a4aadd
--- /dev/null
+++ b/token-core/test-data/wallets/4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca.json
@@ -0,0 +1,36 @@
+{
+  "id": "4b07b86f-cc3f-4bdd-b156-a69d5cbd4bca",
+  "version": 11001,
+  "keyHash": "4e6c074ea45b5fb91dedde3d0f2a98e4bacebad6",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "b861ccef945108ba4549144de514d5ae" },
+    "ciphertext": "d6ab3a9f78cc610d2af5ea977531b958e3ca9d4b6d308591b9ac6c3b7b371d20",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "6581f8aeb6abf554444a2af18704628a1c49fdb5046a5ba7687d90445a166d4e"
+    },
+    "mac": "74c9ae251a8addc7a34332cfcedae390054148abc82127ce15279d418e634e53"
+  },
+  "activeAccounts": [
+    {
+      "address": "TC1nbfByaLWHvK8haEFTkMZJBNxsnKfqKh",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "TRON",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "03f6a261f3b4d7c24014f2026b09ad409076c566b39b99b8e0a7196f391caec508"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703214638,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json b/token-core/test-data/wallets/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json
new file mode 100644
index 00000000..5662cc02
--- /dev/null
+++ b/token-core/test-data/wallets/4d5cbfcf-aee1-4908-9991-9d060eb68a0e.json
@@ -0,0 +1,36 @@
+{
+  "id": "4d5cbfcf-aee1-4908-9991-9d060eb68a0e",
+  "version": 11001,
+  "keyHash": "3a9e72763fa0c09fe692054b9394d2f0855d99b6",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "bb7bd7ad553993efe60ad4d7eba02cc7" },
+    "ciphertext": "e5d4efb36ef52b0b81934764072d010d05a90baa9e5927afc0f1342d49f570a2",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "aaeb5d3f08de7705e4879687804d620cd4d1ad6a6c66bdaf8b258ff3ed960d31"
+    },
+    "mac": "c8ad29fef073f40f8c46fd74e589f1de40365563830cc962bd630f626a815538"
+  },
+  "activeAccounts": [
+    {
+      "address": "tz1d2TfcvWBwtPqo7f21DVv7HSSCoNAVp8gz",
+      "derivationPath": "",
+      "curve": "ED25519",
+      "coin": "TEZOS",
+      "network": "MAINNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "bdb7b056d28a8610de329fb4c367886256cc15a5e438a42fff485cd4fc73e574"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215567,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/60573d8d-8e83-45c3-85a5-34fbb2aad5e1 b/token-core/test-data/wallets/60573d8d-8e83-45c3-85a5-34fbb2aad5e1
new file mode 100644
index 00000000..18323e1b
--- /dev/null
+++ b/token-core/test-data/wallets/60573d8d-8e83-45c3-85a5-34fbb2aad5e1
@@ -0,0 +1,32 @@
+{
+  "imTokenMeta": {
+    "backup": [],
+    "version": "iOS-2.14.1.1742",
+    "mode": "normal",
+    "source": "KEYSTORE",
+    "segWit": "NONE",
+    "name": "Imported 2",
+    "timestamp": "1703213710.762331",
+    "chain": "ETHEREUM",
+    "passwordHint": ""
+  },
+  "id": "60573d8d-8e83-45c3-85a5-34fbb2aad5e1",
+  "version": 3,
+  "address": "02c98f4ed8c8aab1aaba46539e45070a02e416c0",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "21cca31acb4b3ec6824e7209f316d7ca"
+    },
+    "kdfparams": {
+      "dklen": 32,
+      "n": 8192,
+      "p": 1,
+      "r": 8,
+      "salt": "375c44fe7e9f97e1890500dd57327e3ba622ef4af42fa95e0cb099d88d93de2a"
+    },
+    "kdf": "scrypt",
+    "ciphertext": "9b62a4c07c96ca9b0b82b5b5eae4e7c9b2b7db531a6d2991198eb6809a8c35ac",
+    "mac": "f14170589220a51692b64c859ce1e276b832208ea5816dfd37db0a1599b67ddc"
+  }
+}
diff --git a/token-core/test-data/wallets/6c20aab6-1596-456d-9749-212e6139c5ed b/token-core/test-data/wallets/6c20aab6-1596-456d-9749-212e6139c5ed
new file mode 100644
index 00000000..f1fa49e2
--- /dev/null
+++ b/token-core/test-data/wallets/6c20aab6-1596-456d-9749-212e6139c5ed
@@ -0,0 +1,39 @@
+{
+  "xpub": "tpubDC8AkaytytTPrkUaPZpwL1NiRqr93MvGYHP75uQPMtyV9GXyB4hfJ4T7YU3RqXogUCHgvRn7EgePAogxhrPtser2KX3bN1YJBFRZVxhtGNV",
+  "mnemonicPath": "m/49'/1'/0'",
+  "imTokenMeta": {
+    "timestamp": "1703214806.924619",
+    "name": "Imported 7",
+    "segWit": "P2WPKH",
+    "backup": [],
+    "version": "iOS-2.14.1.1742",
+    "chain": "BITCOIN",
+    "source": "MNEMONIC",
+    "network": "TESTNET",
+    "passwordHint": "",
+    "mode": "normal"
+  },
+  "address": "2ND3WGu69ULLWJ3XcmtLyGswSUdbycFjngN",
+  "crypto": {
+    "ciphertext": "a86f985a707d2871d6802027f5cf943e1b66f99ebbb007032c95f721af4e531ed365fb705e15263bcce6aaec68bafc4a46c2f4bc8e83ab24946e6c645425f0743747f47792f55e0c1df573987c0a9d791bf5b95c5265e6bd99c353804c81f3658518bf7d034c1a15aa77435b8a6c95",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "salt": "6c528887c1a3a856c40bb3f87c7ca0091bcfbe01635ab69137554e0c54dcad42",
+      "p": 1
+    },
+    "mac": "a3f9c6f3cf0588dd335d0db6d5e00d8ca0a1942ceb1d31af2c1b94db7b05c28e",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "20f16d3a33fbe4abdcb1bcb0f839fcb4"
+    }
+  },
+  "encMnemonic": {
+    "nonce": "1ec1cbae4075893940fdad972870bd24",
+    "encStr": "dc53ccd9eadce8fac95f9f8551d5563609d5318687f3c24cf17eafa46976d18759f40044780d6f3e51126d13475b60b7868bb97183f73cb2fe97e9182aee6a7163540aa520ea8f0debec"
+  },
+  "version": 44,
+  "id": "6c20aab6-1596-456d-9749-212e6139c5ed"
+}
diff --git a/token-core/test-data/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d b/token-core/test-data/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
new file mode 100644
index 00000000..3f086a2f
--- /dev/null
+++ b/token-core/test-data/wallets/6c3eae60-ad03-48db-a5e5-61a6f72aef8d
@@ -0,0 +1,67 @@
+{
+  "encMnemonic": {
+    "encStr": "476ee81e62675ffb5e727f8e3f15f0222ff084bd4b064089d7a8397efe10bde265d965b214171f9e946128c7855cf53866b753021f6df8bd49b92bdb2caed5b8f618667177eaa5594933",
+    "nonce": "b553ebb7521eb1a9aa7d8738811ab102"
+  },
+  "keyPathPrivates": [
+    {
+      "derivedMode": "HD_SHA256",
+      "path": "",
+      "publicKey": "EOS7tpXQ1thFJ69ZXDqqEan7GMmuWdcptKmwgbs7n1cnx3hWPw3jw",
+      "privateKey": {
+        "encStr": "e44fc17b5bedd1f3409c07c84067f4d8af051b6edf72bfda4a4306f00f87cbde",
+        "nonce": "5485ffc4230fa0d389dde221ec22a0e2"
+      }
+    },
+    {
+      "privateKey": {
+        "encStr": "4267397725dda86d8a45079d7246fac0784c75494308cd8f5c5f157d74ce3a65",
+        "nonce": "d2f0a53208b5ddbda3e3c1808e92c64c"
+      },
+      "derivedMode": "HD_SHA256",
+      "publicKey": "EOS5SxZMjhKiXsmjxac8HBx56wWdZV1sCLZESh3ys1rzbMn4FUumU",
+      "path": ""
+    },
+    {
+      "privateKey": {
+        "nonce": "dae366211338af8bcc01610b0358b78e",
+        "encStr": "622c4a67b70c3e1fb33653dc56dc961cd8b4185252f31dceebab15a98e77f361"
+      },
+      "publicKey": "EOS88XhiiP7Cu5TmAUJqHbyuhyYgd6sei68AU266PyetDDAtjmYWF",
+      "path": "m/44'/194'/0'/0/0",
+      "derivedMode": "PATH_DIRECTLY"
+    }
+  ],
+  "mnemonicPath": "m/44'/194'/0'/0/0",
+  "id": "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+  "version": 10001,
+  "crypto": {
+    "kdf": "scrypt",
+    "kdfparams": {
+      "salt": "43800be9d3459b3ce9b61826555165d5706a2e8ecfceb9e4b1fa341d743f5e60",
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "p": 1
+    },
+    "mac": "50a4fdbb20dc1a860ac93134e9edf15267f9f1a2443c4a329841bc17553758a9",
+    "cipherparams": {
+      "iv": "ac19624cfcb3cd32bd092ddf73aa6157"
+    },
+    "ciphertext": "7cd696ce21680fb9b02c326ec0563b05",
+    "cipher": "aes-128-ctr"
+  },
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "segWit": "NONE",
+    "mode": "normal",
+    "backup": [],
+    "timestamp": "1703213102.143412",
+    "source": "RECOVERED_IDENTITY",
+    "name": "EOS",
+    "version": "iOS-2.14.1.1742",
+    "passwordHint": "",
+    "chain": "EOS"
+  },
+  "address": ""
+}
diff --git a/token-core/test-data/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f b/token-core/test-data/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f
new file mode 100644
index 00000000..09a51f7a
--- /dev/null
+++ b/token-core/test-data/wallets/792a0051-16d7-44a7-921a-9b4a0c893b8f
@@ -0,0 +1,38 @@
+{
+  "id": "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+  "mnemonicPath": "m/44'/60'/0'/0/1",
+  "encMnemonic": {
+    "nonce": "27d0fbb70bd03ce0e96824c0f88bb6ad",
+    "encStr": "b8e34c4ff5ee92f80cd893244c89be1ad75614550b4fde40eb81a214c4676623ec5f92076f495dc3204ab06533cccabbb218b01fbaa47255b56d7c17543aa3462d2f246169fb3377e422"
+  },
+  "imTokenMeta": {
+    "source": "MNEMONIC",
+    "passwordHint": "",
+    "backup": [],
+    "chain": "ETHEREUM",
+    "mode": "normal",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "version": "iOS-2.14.1.1742",
+    "timestamp": "1703217176.7788029",
+    "name": "Imported 12"
+  },
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "kdf": "scrypt",
+    "ciphertext": "a3f81f417cf96399c178fd18c058cf0cdc1023116e293c3c6fe5aa8a58f972f9",
+    "mac": "42f62a4647194f4efe78a07e8517ef9f4974b4bfb71524ed8dc8282f36780ce5",
+    "kdfparams": {
+      "salt": "59663950940345f9e69183f11f74319db35646ae7cd5be2f9f9bc478c07b4f1e",
+      "n": 262144,
+      "dklen": 32,
+      "r": 8,
+      "p": 1
+    },
+    "cipherparams": {
+      "iv": "4f64c9458e04b387dad5c7d0eaab8c91"
+    }
+  },
+  "address": "7152bcad819b084d57179e293d2765ffa0109e04",
+  "version": 3
+}
diff --git a/token-core/test-data/wallets/949bada8-776c-4554-ad0c-001e3726a0f8.json b/token-core/test-data/wallets/949bada8-776c-4554-ad0c-001e3726a0f8.json
new file mode 100644
index 00000000..2357d8d8
--- /dev/null
+++ b/token-core/test-data/wallets/949bada8-776c-4554-ad0c-001e3726a0f8.json
@@ -0,0 +1,36 @@
+{
+  "id": "949bada8-776c-4554-ad0c-001e3726a0f8",
+  "version": 11001,
+  "keyHash": "53753cac330199ee8781a98ea425c4e3269fafb3",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "7be4c9889632aa4606629b8a4ac9ea3a" },
+    "ciphertext": "7577539a2457fb55203efb4dd876d048b4e60c087ec256836b1a37665a93869e47c178c7d65a3adf298405968eb98335e81f9d34480890a23a3750688ba2c6a9",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "0dc1086c96903786a838cb107bd4c726dd5d2e84527eadf73810c7ca846c1ef1"
+    },
+    "mac": "39df9379fd9711cb674fa7db48d5d7e451e0e9910b94bdd437f05a24684f180a"
+  },
+  "activeAccounts": [
+    {
+      "address": "FDS7ZJpJg4R7Kd2hzfsEc6mtW5iknjZ3UazX76EsnbH74v8",
+      "derivationPath": "",
+      "curve": "SubSr25519",
+      "coin": "KUSAMA",
+      "network": "",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "74c6c052c7c31523e52d3f7f810d2549eff08921f98f207815ef49fb94758157"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "test account",
+    "passwordHint": "",
+    "timestamp": 1703215112,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f b/token-core/test-data/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f
new file mode 100644
index 00000000..07cd1aa6
--- /dev/null
+++ b/token-core/test-data/wallets/9b696367-69c1-4cfe-8325-e5530399fc3f
@@ -0,0 +1,38 @@
+{
+  "encMnemonic": {
+    "nonce": "2008d58e51c5404c3c40b9356367b4aa",
+    "encStr": "15f43fbbcedea68eed7366c97978590c4c967c241eccf04ec262037c19e5b674da17af29ccb3c1a20d8ee329f093664f6946a3a4c7a7d14dba6ac57d6ba8930c541397ed1726ba1bb1ce"
+  },
+  "crypto": {
+    "kdfparams": {
+      "r": 8,
+      "dklen": 32,
+      "n": 262144,
+      "salt": "baa68d0f96f49b047c284534d840950ceb819f84b88c5a416b4d5b9ea17f5aa8",
+      "p": 1
+    },
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "ciphertext": "4f0e3646ec292b97862ef9d3591266d40afe2d262478a50da4fc101e8063cac8",
+    "mac": "8e8b0cd5f92eee4934bbdc9ff14be7800f9a612e34bb8e6a868ece82485a35d1",
+    "cipherparams": {
+      "iv": "30845f11343a0cde4c4d51f46d700f24"
+    }
+  },
+  "imTokenMeta": {
+    "version": "iOS-2.14.1.1742",
+    "name": "Imported 4",
+    "source": "MNEMONIC",
+    "chain": "COSMOS",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "timestamp": "1703214474.4959989",
+    "passwordHint": "",
+    "mode": "normal",
+    "backup": []
+  },
+  "mnemonicPath": "m/44'/118'/0'/0/0",
+  "address": "cosmos1m566v5rcklnac8vc0dftfu4lnvznhlu7d3f404",
+  "version": 3,
+  "id": "9b696367-69c1-4cfe-8325-e5530399fc3f"
+}
diff --git a/token-core/test-data/wallets/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3 b/token-core/test-data/wallets/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3
new file mode 100644
index 00000000..9b83d4c1
--- /dev/null
+++ b/token-core/test-data/wallets/9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3
@@ -0,0 +1,39 @@
+{
+  "mnemonicPath": "m/44'/1'/0'",
+  "encMnemonic": {
+    "nonce": "2ee95dd0261dec2a1a169711fc6b122b",
+    "encStr": "5a67693dbeff1c5fe5dc8a4452971ab6716ae7c6b228408611492e61fa743a925b85f27de9bb2060fb7399d406c83974e408ac2a727cda382ea62b8686cd80bbc551e320ba2e8581edd0"
+  },
+  "xpub": "tpubDDLWiBeq9RLDQinYZUJueQBmT4bnY6Tbcsijqb4FgC7ZFifnt3ioiQRvuokYQTqBbLxxpYspFFgS1TAoXxdFBbzhkGFNdKaCRfcXK4sGxcC",
+  "version": 44,
+  "id": "9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3",
+  "imTokenMeta": {
+    "mode": "normal",
+    "network": "TESTNET",
+    "name": "Imported 3",
+    "version": "iOS-2.14.1.1742",
+    "timestamp": "1703213844.307544",
+    "source": "MNEMONIC",
+    "passwordHint": "",
+    "backup": [],
+    "segWit": "NONE",
+    "chain": "BITCOIN"
+  },
+  "address": "myRzNZ88RxzC14V8RDunAP3cx7dyXBFqmA",
+  "crypto": {
+    "kdf": "scrypt",
+    "kdfparams": {
+      "n": 262144,
+      "salt": "0514aba594970e5fe70a169f0710fbb1d34cddae600bc4c6920fcfa95bc0e9b2",
+      "r": 8,
+      "p": 1,
+      "dklen": 32
+    },
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "6de42c00f0a943bbfd8ac38381538268"
+    },
+    "mac": "97f8618e31d6c5e5cd38df78f98466790e44fa7026c077cf6ff60336007b4a80",
+    "ciphertext": "ce067661784ead67f410e26b1fde72012cd2f3db62723597b3a32ffe5075d68ed19bef458f89165b9404be1651a6ecdf87def7455982504e4e9b26901589cde2fdc2c3e55a3e3b0d414ec1dc37f9f9db8b2d2e5704a3f20a25dd08066f94c20ddc670ece8d5f49fa57d877844eed6a"
+  }
+}
diff --git a/token-core/test-data/wallets/9f4acb4a-7431-4c7d-bd25-a19656a86ea0 b/token-core/test-data/wallets/9f4acb4a-7431-4c7d-bd25-a19656a86ea0
new file mode 100644
index 00000000..bd3c72c4
--- /dev/null
+++ b/token-core/test-data/wallets/9f4acb4a-7431-4c7d-bd25-a19656a86ea0
@@ -0,0 +1,33 @@
+{
+  "address": "3PwFUt9EgTkXzJh4cMoQroJZsVSf3w65mN",
+  "id": "9f4acb4a-7431-4c7d-bd25-a19656a86ea0",
+  "crypto": {
+    "cipherparams": {
+      "iv": "547e736a7696c1d5042f2a326448dcad"
+    },
+    "cipher": "aes-128-ctr",
+    "ciphertext": "177f8e5b38357562e363c93a5a724233b35271f34c102bb3bab11ce95b93464eff03e3a5b8339e5b1a0547d1a88373886b1f5763",
+    "kdf": "scrypt",
+    "mac": "965e49c4bdacfd3d82a9ddba7444980983a1d4bb2a3df473a2ed07207385b656",
+    "kdfparams": {
+      "dklen": 32,
+      "n": 262144,
+      "r": 8,
+      "p": 1,
+      "salt": "07722d61dd3a5973edec8b20b0cb8c88685f26784f7cb2608a3f6d9528b7a6b9"
+    }
+  },
+  "imTokenMeta": {
+    "name": "Imported 13",
+    "network": "MAINNET",
+    "passwordHint": "",
+    "source": "WIF",
+    "timestamp": "1703226722.868754",
+    "version": "iOS-2.14.1.1742",
+    "mode": "normal",
+    "backup": [],
+    "chain": "BITCOIN",
+    "segWit": "P2WPKH"
+  },
+  "version": 3
+}
diff --git a/token-core/test-data/wallets/a7294912-b24f-44ba-86c1-48d76117808a.json b/token-core/test-data/wallets/a7294912-b24f-44ba-86c1-48d76117808a.json
new file mode 100644
index 00000000..064c686d
--- /dev/null
+++ b/token-core/test-data/wallets/a7294912-b24f-44ba-86c1-48d76117808a.json
@@ -0,0 +1,36 @@
+{
+  "id": "a7294912-b24f-44ba-86c1-48d76117808a",
+  "version": 11001,
+  "keyHash": "4fc213ddcb6fa44a2e2f4c83d67502f88464e6ee",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "ac82e8975bca06eaeb5932db660909f3" },
+    "ciphertext": "7a703585ece09a10aa033b5f86d499f8b315d021a751ff32ff916f7b462d6299",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "a56738f29a6c41334e6a6d77dd45a80166bfc2b3799081e747303e7f6575b759"
+    },
+    "mac": "5d3ecd2a523ebca45e86cc935a81cb86e148e422bc5c53cb9e02664e56418900"
+  },
+  "activeAccounts": [
+    {
+      "address": "t1zerdvi3fx2lrcslsqdewpadzzm2hefpn6ixew3i",
+      "derivationPath": "",
+      "curve": "SECP256k1",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "02506bc1dc099358e5137292f4efdd57e400f29ba5132aa5d12b18dac1c1f6aaba"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215494,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/ac59ccc1-285b-47a7-92f5-a6c432cee21a b/token-core/test-data/wallets/ac59ccc1-285b-47a7-92f5-a6c432cee21a
new file mode 100644
index 00000000..97afd8cc
--- /dev/null
+++ b/token-core/test-data/wallets/ac59ccc1-285b-47a7-92f5-a6c432cee21a
@@ -0,0 +1,38 @@
+{
+  "address": "cosmos1ajz9y0x3wekez7tz2td2j6l2dftn28v26dd992",
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "timestamp": "1703213078.483429",
+    "passwordHint": "",
+    "mode": "normal",
+    "name": "COSMOS",
+    "chain": "COSMOS",
+    "segWit": "NONE",
+    "backup": [],
+    "version": "iOS-2.14.1.1742",
+    "source": "RECOVERED_IDENTITY"
+  },
+  "encMnemonic": {
+    "encStr": "c8e9fd75dc1a95c7130e30bfbde8a384fe0fc91693cec3aff2529b93a7696cf3b22745f8de96cabbfc63ec31c33cd2de8ce2ec96870dd383d7e13f131272e7a3c358eeb46a36538b0720",
+    "nonce": "15da4b89ec152eb85702e0f596058f52"
+  },
+  "id": "ac59ccc1-285b-47a7-92f5-a6c432cee21a",
+  "crypto": {
+    "kdfparams": {
+      "p": 1,
+      "dklen": 32,
+      "n": 262144,
+      "r": 8,
+      "salt": "14599065a6ad64c42670524f136f4ceacdf72bb7e1b253e2ed56cb4f96e991be"
+    },
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "c029f75712fd6555cd0b30bfa2644454"
+    },
+    "kdf": "scrypt",
+    "ciphertext": "d8bfd56edf4b7270a98ab71c48e0f6ae7f9897859740cfcd57fe4e2415629e62",
+    "mac": "4faea2527d04bfc9edc302875923deadf61113e849b36dfad8ad18d34eb38c63"
+  },
+  "mnemonicPath": "m/44'/118'/0'/0/0",
+  "version": 3
+}
diff --git a/token-core/test-data/wallets/d9e3bb9c-87fd-4836-b146-10a3e249eb75 b/token-core/test-data/wallets/d9e3bb9c-87fd-4836-b146-10a3e249eb75
new file mode 100644
index 00000000..5daec43a
--- /dev/null
+++ b/token-core/test-data/wallets/d9e3bb9c-87fd-4836-b146-10a3e249eb75
@@ -0,0 +1,33 @@
+{
+  "version": 3,
+  "imTokenMeta": {
+    "network": "MAINNET",
+    "name": "Imported 14",
+    "version": "iOS-2.14.1.1742",
+    "source": "WIF",
+    "passwordHint": "",
+    "timestamp": "1703226797.333446",
+    "backup": [],
+    "chain": "BITCOIN",
+    "segWit": "NONE",
+    "mode": "normal"
+  },
+  "id": "d9e3bb9c-87fd-4836-b146-10a3e249eb75",
+  "address": "1962gsZ8PoPUYHneFakkCTrukdFMVQ4i4T",
+  "crypto": {
+    "cipherparams": {
+      "iv": "15f5b149172c5f96fc4eb4c2c618b9fe"
+    },
+    "ciphertext": "4a916ea2fbf9156f1f179ac94dc5f99ba2ed7b9d7841fb9e4271af38fdac9d349368e89c929604ce6987077a7d12e451842513dd",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "mac": "2061aad7f9165828873e04c7db581d5d60c36eba328940b18cc589a6df6095a2",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "p": 1,
+      "salt": "4db39bbbfed6027055eaaa0b92ea4c97b2476f368f70ec8f93a6be3a5cfb2747"
+    }
+  }
+}
diff --git a/token-core/test-data/wallets/f3615a56-cb03-4aa4-a893-89944e49920d b/token-core/test-data/wallets/f3615a56-cb03-4aa4-a893-89944e49920d
new file mode 100644
index 00000000..93f3823c
--- /dev/null
+++ b/token-core/test-data/wallets/f3615a56-cb03-4aa4-a893-89944e49920d
@@ -0,0 +1,33 @@
+{
+  "version": 3,
+  "imTokenMeta": {
+    "name": "Imported 1",
+    "backup": [],
+    "passwordHint": "",
+    "source": "PRIVATE",
+    "timestamp": "1703213241.0374532",
+    "version": "iOS-2.14.1.1742",
+    "mode": "normal",
+    "network": "TESTNET",
+    "segWit": "NONE",
+    "chain": "ETHEREUM"
+  },
+  "id": "f3615a56-cb03-4aa4-a893-89944e49920d",
+  "crypto": {
+    "kdf": "scrypt",
+    "ciphertext": "bd9ed0988742c678f6b1a6a05233c08a00f438b2c62ff2f024abe32527886e3b",
+    "mac": "a606524699adc9419400e18440e1b13e3b727263f13548846ba1a0d6025c2124",
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "e173367006b5bf571351d0f1b2aad303"
+    },
+    "kdfparams": {
+      "dklen": 32,
+      "n": 262144,
+      "r": 8,
+      "p": 1,
+      "salt": "152db1481a9478809729a18236cd85068bbaa32a02da5495500993fd0d871ea2"
+    }
+  },
+  "address": "80427ae1f55bcf60ee4cd2db7549b8bc69a74303"
+}
diff --git a/token-core/test-data/wallets/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json b/token-core/test-data/wallets/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json
new file mode 100644
index 00000000..7fafac49
--- /dev/null
+++ b/token-core/test-data/wallets/fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb.json
@@ -0,0 +1,36 @@
+{
+  "id": "fbdc2a0b-58d5-4e43-b368-a0cb1a2d17cb",
+  "version": 11001,
+  "keyHash": "e0d650a880f2cbbd8302483a06939cd3431592d8",
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": { "iv": "6d9df1458a23ac4408aae9fa5b643210" },
+    "ciphertext": "4ad73446865c2e3d192378c2eabac647a48843ec4f553357b5533933752c06e8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 1024,
+      "prf": "hmac-sha256",
+      "dklen": 32,
+      "salt": "cacea0da408ce9d6f70a909602c23c87eb970490ccc4e06d7d80b4cf5ad67287"
+    },
+    "mac": "0dac456a4572a859e2dacc378435c401e2f1dddaa3191154b8f5f775f498a709"
+  },
+  "activeAccounts": [
+    {
+      "address": "t3qdyntx5snnwgmjkp2ztd6tf6hhcmurxfj53zylrqyympwvzvbznx6vnvdqloate5eviphnzrkupno4wheesa",
+      "derivationPath": "",
+      "curve": "BLS",
+      "coin": "FILECOIN",
+      "network": "TESTNET",
+      "segWit": "",
+      "extPubKey": "",
+      "publicKey": "80f0d9dfb26b6c66254fd6663f4cbe39c4ca46e54f779c2e30c618fb57350e5b7f55b51c16e04c9d2550f3b731551ed7"
+    }
+  ],
+  "imTokenMeta": {
+    "name": "",
+    "passwordHint": "",
+    "timestamp": 1703215416,
+    "source": "PRIVATE"
+  }
+}
diff --git a/token-core/test-data/wallets/identity.json b/token-core/test-data/wallets/identity.json
new file mode 100644
index 00000000..ecab78d3
--- /dev/null
+++ b/token-core/test-data/wallets/identity.json
@@ -0,0 +1,54 @@
+{
+  "imTokenMeta": {
+    "network": "TESTNET",
+    "name": "identity_name",
+    "version": "iOS-2.14.1.1742",
+    "source": "RECOVERED_IDENTITY",
+    "passwordHint": "",
+    "timestamp": "1703213073.8432422",
+    "backup": [],
+    "segWit": "P2WPKH",
+    "mode": "normal"
+  },
+  "version": 10000,
+  "walletIds": [
+    "0597526e-105f-425b-bb44-086fc9dc9568",
+    "00fc0804-7cea-46d8-9e95-ed1efac65358",
+    "ac59ccc1-285b-47a7-92f5-a6c432cee21a",
+    "6c3eae60-ad03-48db-a5e5-61a6f72aef8d",
+    "f3615a56-cb03-4aa4-a893-89944e49920d",
+    "60573d8d-8e83-45c3-85a5-34fbb2aad5e1",
+    "9e3e1a17-ccad-4d93-98ab-cfe1e3f82ed3",
+    "9b696367-69c1-4cfe-8325-e5530399fc3f",
+    "6c20aab6-1596-456d-9749-212e6139c5ed",
+    "792a0051-16d7-44a7-921a-9b4a0c893b8f",
+    "9f4acb4a-7431-4c7d-bd25-a19656a86ea0",
+    "d9e3bb9c-87fd-4836-b146-10a3e249eb75"
+  ],
+  "crypto": {
+    "cipherparams": { "iv": "b947b2ece06b648a75187dcddee67cc1" },
+    "ciphertext": "5f1cbaef883def74b4b27a64586188da00f020f9611d1efc84dffba5ae31a173962e2196589aa66a065e5e0f929b26eac27ca04c8eecc0727f5f91e0038cf6aaba9d827c76c6f225ceaa9d937c3a3f1a958e5fe74585565175d301ead8a67f401250abcd0e832f76a4ed37628170b6",
+    "kdf": "scrypt",
+    "cipher": "aes-128-ctr",
+    "mac": "deeabc0d49e9b2ec0eb97d55cff25e2c14ff74e257c96145fb8e47bc31d8df26",
+    "kdfparams": {
+      "n": 262144,
+      "r": 8,
+      "dklen": 32,
+      "p": 1,
+      "salt": "b0fdfcb67bdfc6461d907f6b55c364ce98e21057b74df586953e2bc6e293c248"
+    }
+  },
+  "encMnemonic": {
+    "encStr": "74c4b82c2af67c35b8ff31c3547a705d94f9a66397f1aa4118eb6450ec140f055117ec2a87a4402069a3837db7d1b20d16e4e1b9b93c6b615c739b833bd9cb20148c6c37efd777fb6b30",
+    "nonce": "a293778a4eec6fdd6f7c7ac0edcd869f"
+  },
+  "encAuthKey": {
+    "encStr": "628e9f0926f12abed0c201bc605af2a378a72cbc397c182c270888ca7dad4d1f",
+    "nonce": "93e5aff1a87c6f3be9b5bef506478dae"
+  },
+  "id": "d5017486-f9b2-4aeb-8f7b-c57da9b77668",
+  "identifier": "im18MDKM8hcTykvMmhLnov9m2BaFqsdjoA7cwNg",
+  "ipfsId": "QmSTTidyfa4np9ak9BZP38atuzkCHy4K59oif23f4dNAGU",
+  "encKey": "9513617c9b398edebfb46080a8f0cf6cab6763866bb06daa63503722bea78907"
+}
diff --git a/token-core/zksync-crypto/.gitignore b/token-core/zksync-crypto/.gitignore
deleted file mode 100644
index f55693fc..00000000
--- a/token-core/zksync-crypto/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-bin/
-wasm-pack.log
diff --git a/token-core/zksync-crypto/Cargo.lock b/token-core/zksync-crypto/Cargo.lock
deleted file mode 100644
index fa894561..00000000
--- a/token-core/zksync-crypto/Cargo.lock
+++ /dev/null
@@ -1,3205 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "aes"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9"
-dependencies = [
- "aes-soft",
- "aesni",
- "block-cipher-trait",
-]
-
-[[package]]
-name = "aes-ctr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee"
-dependencies = [
- "aes-soft",
- "aesni",
- "ctr",
- "stream-cipher",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
-dependencies = [
- "block-cipher-trait",
- "byteorder",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "aesni"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
-dependencies = [
- "block-cipher-trait",
- "opaque-debug 0.2.3",
- "stream-cipher",
-]
-
-[[package]]
-name = "alga"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
-dependencies = [
- "approx",
- "num-complex 0.2.4",
- "num-traits",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
-
-[[package]]
-name = "approx"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "async-channel"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "once_cell",
- "vec-arena",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-io",
- "async-mutex",
- "blocking",
- "futures-lite",
- "num_cpus",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
-dependencies = [
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "libc",
- "log",
- "nb-connect",
- "once_cell",
- "parking",
- "polling",
- "vec-arena",
- "waker-fn",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb"
-dependencies = [
- "event-listener",
-]
-
-[[package]]
-name = "async-mutex"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
-dependencies = [
- "event-listener",
-]
-
-[[package]]
-name = "async-native-tls"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33"
-dependencies = [
- "async-std",
- "native-tls",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "async-std"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341"
-dependencies = [
- "async-channel",
- "async-global-executor",
- "async-io",
- "async-lock",
- "crossbeam-utils 0.8.3",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "num_cpus",
- "once_cell",
- "pin-project-lite 0.2.6",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures 0.4.10",
-]
-
-[[package]]
-name = "async-task"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
-
-[[package]]
-name = "atomic-waker"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
-
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-dependencies = [
- "byteorder",
- "safemem",
-]
-
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bellman_ce"
-version = "0.3.2"
-source = "git+https://github.com/matter-labs/bellman?branch=beta#48441155ec7006bf7bfac553b5fb7d466d7fcd00"
-dependencies = [
- "bit-vec",
- "blake2s_const",
- "blake2s_simd",
- "byteorder",
- "cfg-if 1.0.0",
- "crossbeam",
- "futures 0.3.14",
- "hex",
- "lazy_static",
- "num_cpus",
- "pairing_ce",
- "rand 0.4.6",
- "tiny-keccak 1.5.0",
-]
-
-[[package]]
-name = "bigdecimal"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc403c26e6b03005522e6e8053384c4e881dfe5b2bf041c0c2c49be33d64a539"
-dependencies = [
- "num-bigint 0.3.2",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bitvec"
-version = "0.17.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
-dependencies = [
- "either",
- "radium",
-]
-
-[[package]]
-name = "blake2"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4"
-dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "blake2-rfc_bellman_edition"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc60350286c7c3db13b98e91dbe5c8b6830a6821bc20af5b0c310ce94d74915"
-dependencies = [
- "arrayvec 0.4.12",
- "byteorder",
- "constant_time_eq",
-]
-
-[[package]]
-name = "blake2s_const"
-version = "0.6.0"
-source = "git+https://github.com/matter-labs/bellman?branch=beta#48441155ec7006bf7bfac553b5fb7d466d7fcd00"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq",
-]
-
-[[package]]
-name = "blake2s_simd"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.4",
-]
-
-[[package]]
-name = "block-cipher-trait"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-modes"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529"
-dependencies = [
- "block-cipher-trait",
- "block-padding",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "blocking"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9"
-dependencies = [
- "async-channel",
- "async-task",
- "atomic-waker",
- "fastrand",
- "futures-lite",
- "once_cell",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
-
-[[package]]
-name = "byte-slice-cast"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
-[[package]]
-name = "bytes"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
-
-[[package]]
-name = "cache-padded"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
-
-[[package]]
-name = "cc"
-version = "1.0.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "rustc-serialize",
- "serde",
- "time",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
-dependencies = [
- "cache-padded",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
-
-[[package]]
-name = "cpuid-bool"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
-
-[[package]]
-name = "crossbeam"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
-dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-channel 0.4.4",
- "crossbeam-deque 0.7.3",
- "crossbeam-epoch 0.8.2",
- "crossbeam-queue",
- "crossbeam-utils 0.7.2",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-dependencies = [
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils 0.8.3",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-dependencies = [
- "crossbeam-epoch 0.8.2",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.3",
- "crossbeam-utils 0.8.3",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg 1.0.1",
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "lazy_static",
- "maybe-uninit",
- "memoffset 0.5.6",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils 0.8.3",
- "lazy_static",
- "memoffset 0.6.3",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg 1.0.1",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
-dependencies = [
- "autocfg 1.0.1",
- "cfg-if 1.0.0",
- "lazy_static",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.4",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array 0.14.4",
- "subtle 2.4.0",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
-dependencies = [
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "ctr"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736"
-dependencies = [
- "block-cipher-trait",
- "stream-cipher",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6"
-dependencies = [
- "convert_case",
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
-dependencies = [
- "generic-array 0.9.1",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.4",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "ethabi"
-version = "12.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052a565e3de82944527d6d10a465697e6bb92476b772ca7141080c901f6a63c6"
-dependencies = [
- "ethereum-types",
- "rustc-hex",
- "serde",
- "serde_json",
- "tiny-keccak 1.5.0",
- "uint",
-]
-
-[[package]]
-name = "ethbloom"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak 2.0.2",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "uint",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fastrand"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "ff_ce"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38107cbd8bac0d907d7e7513c9f68c95adbda9e6f6f6bdf3f5111c6ecac4fe47"
-dependencies = [
- "byteorder",
- "ff_derive_ce",
- "hex",
- "rand 0.4.6",
-]
-
-[[package]]
-name = "ff_derive_ce"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde5a00073374b4d7aa2d3a8359a5709f9c0bfac8393f254655d16b4acdfe823"
-dependencies = [
- "num-bigint 0.4.0",
- "num-integer",
- "num-traits",
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "fixed-hash"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c"
-dependencies = [
- "byteorder",
- "rand 0.7.3",
- "rustc-hex",
- "static_assertions",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "franklin-crypto"
-version = "0.0.5"
-source = "git+https://github.com/matter-labs/franklin-crypto.git?branch=beta#4a706d93628980e036249e3b182b91af8797ce8c"
-dependencies = [
- "bellman_ce",
- "bit-vec",
- "blake2",
- "blake2-rfc_bellman_edition",
- "blake2s_simd",
- "byteorder",
- "digest 0.7.6",
- "hex",
- "hmac",
- "itertools",
- "num-bigint 0.3.2",
- "num-integer",
- "num-traits",
- "poseidon_hash",
- "rand 0.4.6",
- "serde",
- "serde_derive",
- "sha2 0.8.2",
- "splitmut",
- "tiny-keccak 1.5.0",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
- "num_cpus",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
-
-[[package]]
-name = "futures-lite"
-version = "1.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite 0.2.6",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
-
-[[package]]
-name = "futures-task"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
-[[package]]
-name = "futures-util"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite 0.2.6",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d00328cedcac5e81c683e5620ca6a30756fc23027ebf9bff405c0e8da1fbb7e"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "h2"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
-dependencies = [
- "crypto-mac 0.7.0",
- "digest 0.8.1",
-]
-
-[[package]]
-name = "http"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
-dependencies = [
- "bytes 1.0.1",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
-dependencies = [
- "bytes 0.5.6",
- "http",
-]
-
-[[package]]
-name = "httparse"
-version = "1.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589"
-
-[[package]]
-name = "httpdate"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
-
-[[package]]
-name = "hyper"
-version = "0.13.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
-dependencies = [
- "bytes 0.5.6",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project",
- "socket2 0.3.19",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
-dependencies = [
- "bytes 0.5.6",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-tls",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "impl-codec"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"
-dependencies = [
- "parity-scale-codec",
-]
-
-[[package]]
-name = "impl-rlp"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5"
-dependencies = [
- "rlp",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
-dependencies = [
- "autocfg 1.0.1",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
-
-[[package]]
-name = "js-sys"
-version = "0.3.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jsonrpc-core"
-version = "14.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62"
-dependencies = [
- "futures 0.1.31",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
-
-[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
-[[package]]
-name = "lock_api"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if 1.0.0",
- "value-bag",
-]
-
-[[package]]
-name = "matchers"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
-name = "mathru"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7584d97fddf282cc3e5cc6fae54e596cfcd708a3b375633294d9db8e8b6d776"
-dependencies = [
- "rand 0.7.3",
- "serde",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
-
-[[package]]
-name = "memoffset"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
-dependencies = [
- "autocfg 1.0.1",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
-dependencies = [
- "autocfg 1.0.1",
-]
-
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "nb-connect"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d"
-dependencies = [
- "libc",
- "socket2 0.4.0",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "num"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
-dependencies = [
- "num-bigint 0.3.2",
- "num-complex 0.3.1",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg 1.0.1",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
-dependencies = [
- "autocfg 1.0.1",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
-dependencies = [
- "autocfg 1.0.1",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg 1.0.1",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
-dependencies = [
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg 1.0.1",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
-dependencies = [
- "autocfg 1.0.1",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg 1.0.1",
- "num-bigint 0.3.2",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg 1.0.1",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"
-dependencies = [
- "autocfg 1.0.1",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "pairing_ce"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e753515675eaaa98071d814bea0148ae8c9d7995fa0531bf222e7857e3f1759"
-dependencies = [
- "byteorder",
- "cfg-if 1.0.0",
- "ff_ce",
- "rand 0.4.6",
-]
-
-[[package]]
-name = "parity-crypto"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e15b5e11d7a4829490630a797c537a68c9e864a139f56fe7a1e6a51f0da25d"
-dependencies = [
- "aes",
- "aes-ctr",
- "block-modes",
- "digest 0.8.1",
- "ethereum-types",
- "hmac",
- "lazy_static",
- "pbkdf2",
- "rand 0.7.3",
- "ripemd160",
- "rustc-hex",
- "scrypt",
- "secp256k1",
- "sha2 0.8.2",
- "subtle 2.4.0",
- "tiny-keccak 2.0.2",
- "zeroize",
-]
-
-[[package]]
-name = "parity-scale-codec"
-version = "1.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
-dependencies = [
- "arrayvec 0.5.2",
- "bitvec",
- "byte-slice-cast",
- "serde",
-]
-
-[[package]]
-name = "parking"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
-dependencies = [
- "base64 0.9.3",
- "byteorder",
- "crypto-mac 0.7.0",
- "hmac",
- "rand 0.5.6",
- "sha2 0.8.2",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pin-project"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
-dependencies = [
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
-
-[[package]]
-name = "polling"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "log",
- "wepoll-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "poseidon_hash"
-version = "0.0.1"
-source = "git+https://github.com/shamatar/poseidon_hash.git#495ae87ff066d066b140c7d0dff8d929b87d31ee"
-dependencies = [
- "alga",
- "approx",
- "blake2-rfc_bellman_edition",
- "byteorder",
- "mathru",
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits",
- "pairing_ce",
- "rand 0.4.6",
- "sha2 0.8.2",
- "tiny-keccak 1.5.0",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "primitive-types"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809"
-dependencies = [
- "fixed-hash",
- "impl-codec",
- "impl-rlp",
- "impl-serde",
- "uint",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
-dependencies = [
- "unicode-xid 0.2.1",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2 1.0.26",
-]
-
-[[package]]
-name = "radium"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.7",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
-dependencies = [
- "libc",
- "rand_chacha 0.3.0",
- "rand_core 0.6.2",
- "rand_hc 0.3.0",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
-dependencies = [
- "getrandom 0.2.2",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
-dependencies = [
- "rand_core 0.6.2",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rayon"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
-dependencies = [
- "autocfg 1.0.1",
- "crossbeam-deque 0.8.0",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
-dependencies = [
- "crossbeam-channel 0.5.1",
- "crossbeam-deque 0.8.0",
- "crossbeam-utils 0.8.3",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "recursive_aggregation_circuit"
-version = "1.0.0"
-source = "git+https://github.com/matter-labs/recursive_aggregation_circuit.git?branch=master#30bbf42c81c08ba8a15dcad3eaca9e771c4d8c89"
-dependencies = [
- "franklin-crypto",
- "hex",
- "once_cell",
- "sha2 0.9.3",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-dependencies = [
- "byteorder",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "rlp"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73"
-dependencies = [
- "rustc-hex",
-]
-
-[[package]]
-name = "rustc-hex"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
-
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scrypt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "656c79d0e90d0ab28ac86bf3c3d10bfbbac91450d3f190113b4e76d9fec3cfdd"
-dependencies = [
- "byte-tools",
- "byteorder",
- "hmac",
- "pbkdf2",
- "sha2 0.8.2",
-]
-
-[[package]]
-name = "secp256k1"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2932dc07acd2066ff2e3921a4419606b220ba6cd03a9935123856cc534877056"
-dependencies = [
- "rand 0.6.5",
- "secp256k1-sys",
-]
-
-[[package]]
-name = "secp256k1-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab2c26f0d3552a0f12e639ae8a64afc2e3db9c52fe32f5fc6c289d38519f220"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.125"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.125"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
-dependencies = [
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpuid-bool",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpuid-bool",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "smallvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
-
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "soketto"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88"
-dependencies = [
- "base64 0.12.3",
- "bytes 0.5.6",
- "futures 0.3.14",
- "httparse",
- "log",
- "rand 0.7.3",
- "sha-1",
-]
-
-[[package]]
-name = "splitmut"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85070f382340e8b23a75808e83573ddf65f9ad9143df9573ca37c1ed2ee956a"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "stream-cipher"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
-[[package]]
-name = "subtle"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
-
-[[package]]
-name = "syn"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
-dependencies = [
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "unicode-xid 0.2.1",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "rand 0.8.3",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
-dependencies = [
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tiny-keccak"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
- "memchr",
- "mio",
- "pin-project-lite 0.1.12",
- "slab",
-]
-
-[[package]]
-name = "tokio-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
-dependencies = [
- "bytes 0.5.6",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite 0.1.12",
- "tokio",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
-
-[[package]]
-name = "tracing"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
-dependencies = [
- "cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.6",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
-dependencies = [
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa"
-dependencies = [
- "ansi_term",
- "chrono",
- "lazy_static",
- "matchers",
- "regex",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "typenum"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
-
-[[package]]
-name = "uint"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177"
-dependencies = [
- "byteorder",
- "crunchy",
- "rustc-hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "url"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "value-bag"
-version = "1.0.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1"
-dependencies = [
- "ctor",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
-
-[[package]]
-name = "vec-arena"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "vlog"
-version = "1.0.0"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f"
-dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c"
-dependencies = [
- "cfg-if 0.1.10",
- "futures 0.1.31",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7add542ea1ac7fdaa9dc25e031a6af33b7d63376292bd24140c637d00d1c312a"
-dependencies = [
- "cfg-if 0.1.10",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4"
-dependencies = [
- "quote 1.0.9",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931"
-dependencies = [
- "proc-macro2 1.0.26",
- "quote 1.0.9",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639"
-
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d9693b63a742d481c7f80587e057920e568317b2806988c59cd71618bc26c1"
-dependencies = [
- "console_error_panic_hook",
- "futures 0.1.31",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures 0.3.27",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0789dac148a8840bbcf9efe13905463b733fa96543bfbf263790535c11af7ba5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "web3"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d03f64be59921dbc5791f05af61a87594bb454518fe4e97d827405422279a0"
-dependencies = [
- "arrayvec 0.5.2",
- "async-native-tls",
- "async-std",
- "base64 0.12.3",
- "derive_more",
- "ethabi",
- "ethereum-types",
- "futures 0.3.14",
- "futures-timer",
- "hyper",
- "hyper-tls",
- "jsonrpc-core",
- "log",
- "native-tls",
- "parking_lot",
- "rlp",
- "rustc-hex",
- "secp256k1",
- "serde",
- "serde_json",
- "soketto",
- "tiny-keccak 2.0.2",
- "url",
-]
-
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "wepoll-sys"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
-
-[[package]]
-name = "zksync-crypto"
-version = "1.0.0"
-dependencies = [
- "console_error_panic_hook",
- "franklin-crypto",
- "hex",
- "rand 0.4.6",
- "sha2 0.8.2",
- "wasm-bindgen",
- "wasm-bindgen-test",
- "wee_alloc",
- "zksync_crypto",
- "zksync_types",
-]
-
-[[package]]
-name = "zksync_basic_types"
-version = "1.0.0"
-dependencies = [
- "serde",
- "web3",
-]
-
-[[package]]
-name = "zksync_crypto"
-version = "1.0.0"
-dependencies = [
- "anyhow",
- "base64 0.13.0",
- "ethabi",
- "fnv",
- "franklin-crypto",
- "hex",
- "lazy_static",
- "num",
- "rand 0.4.6",
- "rayon",
- "recursive_aggregation_circuit",
- "serde",
- "zksync_basic_types",
-]
-
-[[package]]
-name = "zksync_types"
-version = "1.0.0"
-dependencies = [
- "anyhow",
- "chrono",
- "ethabi",
- "hex",
- "itertools",
- "num",
- "parity-crypto",
- "serde",
- "serde_json",
- "tiny-keccak 1.5.0",
- "vlog",
- "zksync_basic_types",
- "zksync_crypto",
- "zksync_utils",
-]
-
-[[package]]
-name = "zksync_utils"
-version = "1.0.0"
-dependencies = [
- "anyhow",
- "bigdecimal",
- "futures 0.3.14",
- "hex",
- "num",
- "serde",
-]
diff --git a/token-core/zksync-crypto/Cargo.toml b/token-core/zksync-crypto/Cargo.toml
deleted file mode 100644
index f5cc98bd..00000000
--- a/token-core/zksync-crypto/Cargo.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-#[workspace]
-
-[package]
-name = "zksync-crypto"
-version = "1.0.0"
-edition = "2018"
-authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
-homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync"
-license = "Apache-2.0"
-keywords = ["blockchain", "zksync"]
-categories = ["cryptography"]
-publish = false # This library is not published stand-alone, it is bundled with `zksync.js`.
-
-#[lib]
-#crate-type = ["cdylib"]
-#
-[features]
-default = ["console_error_panic_hook"]
-
-[dependencies]
-franklin_crypto = { package = "franklin-crypto", git = "https://github.com/matter-labs/franklin-crypto.git", branch="beta"}
-rand = "0.4"
-
-wasm-bindgen = "=0.2.60"
-hex = "0.4"
-sha2 = "0.8"
-
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.6", optional = true }
-
-# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
-# compared to the default allocator's ~10K. It is slower than the default
-# allocator, however.
-#
-# Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
-wee_alloc = { version = "0.4.2", optional = true }
-
-[dev-dependencies]
-wasm-bindgen-test = "0.2"
-#zksync_types = { path = "../../core/lib/types" }
-#crypto_lib = { package = "zksync_crypto", path = "../../core/lib/crypto" }
-
-[profile.release]
-# Tell `rustc` to optimize for small code size.
-opt-level = "s"
diff --git a/token-core/zksync-crypto/build.sh b/token-core/zksync-crypto/build.sh
deleted file mode 100755
index aaa3da54..00000000
--- a/token-core/zksync-crypto/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-which wasm-pack || cargo install wasm-pack
-
-# pack for bundler (!note this verion is used in the pkg.browser field)
-wasm-pack build --release --target=bundler --out-name=zksync-crypto-bundler --out-dir=dist
-
-# pack for browser
-wasm-pack build --release --target=web --out-name=zksync-crypto-web --out-dir=dist
-
-# pack for node.js
-wasm-pack build --release --target=nodejs --out-name=zksync-crypto-node --out-dir=dist
-rm dist/package.json
diff --git a/token-core/zksync-crypto/package.json b/token-core/zksync-crypto/package.json
deleted file mode 100644
index ab927f9c..00000000
--- a/token-core/zksync-crypto/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"name": "zksync-crypto",
-	"version": "0.4.5",
-	"browser": "dist/zksync-crypto-web.js",
-	"main": "dist/zksync-crypto-node.js",
-	"files": [
-		"dist/*.ts",
-		"dist/*.wasm",
-		"dist/*.js"
-	],
-	"scripts": {
-		"build": "./build.sh && node web-wasm.js",
-		"test": "f cargo test"
-	}
-}
diff --git a/token-core/zksync-crypto/src/lib.rs b/token-core/zksync-crypto/src/lib.rs
deleted file mode 100644
index 76b22797..00000000
--- a/token-core/zksync-crypto/src/lib.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-//! Utils for signing zksync transactions.
-//! This crate is compiled into wasm to be used in `zksync.js`.
-
-#[cfg(test)]
-mod tests;
-mod utils;
-
-const PACKED_POINT_SIZE: usize = 32;
-const PACKED_SIGNATURE_SIZE: usize = 64;
-
-pub use franklin_crypto::bellman::pairing::bn256::{Bn256 as Engine, Fr};
-use franklin_crypto::rescue::bn256::Bn256RescueParams;
-
-pub type Fs = <Engine as JubjubEngine>::Fs;
-
-thread_local! {
-    pub static JUBJUB_PARAMS: AltJubjubBn256 = AltJubjubBn256::new();
-    pub static RESCUE_PARAMS: Bn256RescueParams = Bn256RescueParams::new_checked_2_into_1();
-}
-
-use wasm_bindgen::prelude::*;
-
-use franklin_crypto::{
-    alt_babyjubjub::{fs::FsRepr, AltJubjubBn256, FixedGenerators},
-    bellman::pairing::ff::{PrimeField, PrimeFieldRepr},
-    eddsa::{PrivateKey, PublicKey, Seed},
-    jubjub::JubjubEngine,
-};
-
-use crate::utils::set_panic_hook;
-use sha2::{Digest, Sha256};
-
-// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-// allocator.
-#[cfg(feature = "wee_alloc")]
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-
-#[wasm_bindgen(start)]
-/// This method initializes params for current thread, otherwise they will be initialized when signing
-/// first message.
-pub fn zksync_crypto_init() {
-    JUBJUB_PARAMS.with(|_| {});
-    RESCUE_PARAMS.with(|_| {});
-    set_panic_hook();
-}
-
-#[wasm_bindgen(js_name = privateKeyFromSeed)]
-pub fn private_key_from_seed(seed: &[u8]) -> Result<Vec<u8>, JsValue> {
-    if seed.len() < 32 {
-        return Err(JsValue::from_str("Seed is too short"));
-    };
-
-    let sha256_bytes = |input: &[u8]| -> Vec<u8> {
-        let mut hasher = Sha256::new();
-        hasher.input(input);
-        hasher.result().to_vec()
-    };
-
-    let mut effective_seed = sha256_bytes(seed);
-
-    loop {
-        let raw_priv_key = sha256_bytes(&effective_seed);
-        let mut fs_repr = FsRepr::default();
-        fs_repr
-            .read_be(&raw_priv_key[..])
-            .expect("failed to read raw_priv_key");
-        if Fs::from_repr(fs_repr).is_ok() {
-            return Ok(raw_priv_key);
-        } else {
-            effective_seed = raw_priv_key;
-        }
-    }
-}
-
-fn read_signing_key(private_key: &[u8]) -> Result<PrivateKey<Engine>, JsValue> {
-    let mut fs_repr = FsRepr::default();
-    fs_repr
-        .read_be(private_key)
-        .map_err(|_| JsValue::from_str("couldn't read private key repr"))?;
-    Ok(PrivateKey::<Engine>(
-        Fs::from_repr(fs_repr).expect("couldn't read private key from repr"),
-    ))
-}
-
-fn privkey_to_pubkey_internal(private_key: &[u8]) -> Result<PublicKey<Engine>, JsValue> {
-    let p_g = FixedGenerators::SpendingKeyGenerator;
-
-    let sk = read_signing_key(private_key)?;
-
-    Ok(JUBJUB_PARAMS.with(|params| PublicKey::from_private(&sk, p_g, params)))
-}
-
-#[wasm_bindgen(js_name = pubKeyHash)]
-pub fn pub_key_hash(pubkey: &[u8]) -> Result<Vec<u8>, JsValue> {
-    let pubkey = JUBJUB_PARAMS
-        .with(|params| PublicKey::read(&pubkey[..], params))
-        .map_err(|_| JsValue::from_str("couldn't read public key"))?;
-    Ok(utils::pub_key_hash(&pubkey))
-}
-
-#[wasm_bindgen]
-pub fn private_key_to_pubkey_hash(private_key: &[u8]) -> Result<Vec<u8>, JsValue> {
-    Ok(utils::pub_key_hash(&privkey_to_pubkey_internal(
-        private_key,
-    )?))
-}
-
-#[wasm_bindgen]
-pub fn private_key_to_pubkey(private_key: &[u8]) -> Result<Vec<u8>, JsValue> {
-    let mut pubkey_buf = Vec::with_capacity(PACKED_POINT_SIZE);
-
-    let pubkey = privkey_to_pubkey_internal(private_key)?;
-
-    pubkey
-        .write(&mut pubkey_buf)
-        .expect("failed to write pubkey to buffer");
-
-    Ok(pubkey_buf)
-}
-
-#[wasm_bindgen(js_name = "rescueHash")]
-pub fn rescue_hash_tx_msg(msg: &[u8]) -> Vec<u8> {
-    utils::rescue_hash_tx_msg(msg)
-}
-
-#[wasm_bindgen]
-/// We use musig Schnorr signature scheme.
-/// It is impossible to restore signer for signature, that is why we provide public key of the signer
-/// along with signature.
-/// [0..32] - packed public key of signer.
-/// [32..64] - packed r point of the signature.
-/// [64..96] - s poing of the signature.
-pub fn sign_musig(private_key: &[u8], msg: &[u8]) -> Result<Vec<u8>, JsValue> {
-    let mut packed_full_signature = Vec::with_capacity(PACKED_POINT_SIZE + PACKED_SIGNATURE_SIZE);
-    let p_g = FixedGenerators::SpendingKeyGenerator;
-    let private_key = read_signing_key(private_key)?;
-
-    {
-        let public_key =
-            JUBJUB_PARAMS.with(|params| PublicKey::from_private(&private_key, p_g, params));
-        public_key
-            .write(&mut packed_full_signature)
-            .expect("failed to write pubkey to packed_point");
-    };
-
-    let signature = JUBJUB_PARAMS.with(|jubjub_params| {
-        RESCUE_PARAMS.with(|rescue_params| {
-            let hashed_msg = utils::rescue_hash_tx_msg(msg);
-            let seed = Seed::deterministic_seed(&private_key, &hashed_msg);
-            private_key.musig_rescue_sign(&hashed_msg, &seed, p_g, rescue_params, jubjub_params)
-        })
-    });
-
-    signature
-        .r
-        .write(&mut packed_full_signature)
-        .expect("failed to write signature");
-    signature
-        .s
-        .into_repr()
-        .write_le(&mut packed_full_signature)
-        .expect("failed to write signature repr");
-
-    assert_eq!(
-        packed_full_signature.len(),
-        PACKED_POINT_SIZE + PACKED_SIGNATURE_SIZE,
-        "incorrect signature size when signing"
-    );
-
-    Ok(packed_full_signature)
-}
diff --git a/token-core/zksync-crypto/src/tests.rs b/token-core/zksync-crypto/src/tests.rs
deleted file mode 100644
index 1a6b125f..00000000
--- a/token-core/zksync-crypto/src/tests.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-//tests.rs文件里引用了一些除了zksync-crypto之外其他的zksync官方的库，但是TCX引入这些库会导致
-//编译错误，为了简单起见先把tests.rs文件里的所有数据都注掉，这样就能解决编译的错误。而且这个文件里面的内容是TCX里用不到的。
-
-//! Compare crypto primitives to those that we use in our `zksync_types` crate;
-
-// use super::{private_key_to_pubkey_hash, read_signing_key, sign_musig};
-//
-// use crypto_lib::{public_key_from_private, Engine};
-// use franklin_crypto::bellman::pairing::ff::{self, PrimeField, PrimeFieldRepr};
-// use franklin_crypto::eddsa::PrivateKey;
-// use rand::{Rng, SeedableRng, XorShiftRng};
-// use zksync_types::{tx::TxSignature, PubKeyHash};
-
-// fn gen_private_key_and_its_be_bytes() -> (PrivateKey<Engine>, Vec<u8>) {
-//     let mut rng = XorShiftRng::from_seed([1, 2, 3, 4]);
-//
-//     let pk = PrivateKey::<Engine>(rng.gen());
-//     let mut serialized_key = Vec::new();
-//     pk.0.into_repr()
-//         .write_be(&mut serialized_key)
-//         .expect("private key write");
-//     (pk, serialized_key)
-// }
-
-// #[test]
-// fn test_private_key_read() {
-//     let (zksync_types_pk, serialized_pk) = gen_private_key_and_its_be_bytes();
-//
-//     let wasm_pk = read_signing_key(&serialized_pk).unwrap();
-//     assert_eq!(ff::to_hex(&wasm_pk.0), ff::to_hex(&zksync_types_pk.0));
-// }
-
-// #[test]
-// fn test_pubkey_hash() {
-//     let (pk, serialized_pk) = gen_private_key_and_its_be_bytes();
-//
-//     let wasm_pubkey_hash = private_key_to_pubkey_hash(&serialized_pk).unwrap();
-//     let zksync_types_pubkey_hash = PubKeyHash::from_privkey(&pk).data.to_vec();
-//     assert_eq!(wasm_pubkey_hash, zksync_types_pubkey_hash);
-// }
-
-// #[test]
-// fn test_signature() {
-//     let mut rng = XorShiftRng::from_seed([1, 2, 3, 4]);
-//     let mut random_msg = |len| rng.gen_iter::<u8>().take(len).collect::<Vec<_>>();
-//
-//     let (pk, serialized_pk) = gen_private_key_and_its_be_bytes();
-//     let pubkey = public_key_from_private(&pk);
-//
-//     for msg_len in &[0, 2, 4, 5, 32, 128] {
-//         let msg = random_msg(*msg_len);
-//
-//         let wasm_signature = sign_musig(&serialized_pk, &msg).unwrap();
-//
-//         let wasm_unpacked_signature = TxSignature::deserialize_from_packed_bytes(&wasm_signature)
-//             .expect("failed to unpack signature");
-//
-//         let signer_pubkey = wasm_unpacked_signature.verify_musig(&msg);
-//         assert_eq!(
-//             signer_pubkey.map(|pk| pk.0.into_xy()),
-//             Some(pubkey.0.into_xy()),
-//             "msg_len: {}, msg_hex: {}, wasm_signature_hex:{}",
-//             msg_len,
-//             hex::encode(&msg),
-//             hex::encode(&wasm_signature)
-//         );
-//     }
-// }
diff --git a/token-core/zksync-crypto/src/utils.rs b/token-core/zksync-crypto/src/utils.rs
deleted file mode 100644
index 4c47ca35..00000000
--- a/token-core/zksync-crypto/src/utils.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::RESCUE_PARAMS;
-use crate::{Engine, Fr};
-use franklin_crypto::{
-    bellman::{pairing::ff::PrimeField, BitIterator},
-    circuit::multipack,
-    eddsa::PublicKey,
-    rescue::rescue_hash,
-};
-
-const PAD_MSG_BEFORE_HASH_BITS_LEN: usize = 736;
-const NEW_PUBKEY_HASH_WIDTH: usize = 160;
-
-pub fn set_panic_hook() {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    #[cfg(feature = "console_error_panic_hook")]
-    console_error_panic_hook::set_once();
-}
-
-pub fn bytes_into_be_bits(bytes: &[u8]) -> Vec<bool> {
-    let mut bits = Vec::with_capacity(bytes.len() * 8);
-    for byte in bytes {
-        let mut temp = *byte;
-        for _ in 0..8 {
-            bits.push(temp & 0x80 == 0x80);
-            temp <<= 1;
-        }
-    }
-    bits
-}
-
-pub fn pack_bits_into_bytes(bits: Vec<bool>) -> Vec<u8> {
-    let mut message_bytes: Vec<u8> = Vec::with_capacity(bits.len() / 8);
-    let byte_chunks = bits.chunks(8);
-    for byte_chunk in byte_chunks {
-        let mut byte = 0u8;
-        for (i, bit) in byte_chunk.iter().enumerate() {
-            if *bit {
-                byte |= 1 << i;
-            }
-        }
-        message_bytes.push(byte);
-    }
-    message_bytes
-}
-
-pub fn append_le_fixed_width(content: &mut Vec<bool>, x: &Fr, width: usize) {
-    let mut token_bits: Vec<bool> = BitIterator::new(x.into_repr()).collect();
-    token_bits.reverse();
-    token_bits.resize(width, false);
-    content.extend(token_bits);
-}
-
-pub fn le_bit_vector_into_bytes(bits: &[bool]) -> Vec<u8> {
-    let mut bytes: Vec<u8> = Vec::with_capacity(bits.len() / 8);
-
-    let byte_chunks = bits.chunks(8);
-
-    for byte_chunk in byte_chunks {
-        let mut byte = 0u8;
-        // pack just in order
-        for (i, bit) in byte_chunk.iter().enumerate() {
-            if *bit {
-                byte |= 1 << i;
-            }
-        }
-        bytes.push(byte);
-    }
-
-    bytes
-}
-
-pub fn pub_key_hash(pub_key: &PublicKey<Engine>) -> Vec<u8> {
-    let (pub_x, pub_y) = pub_key.0.into_xy();
-    let pub_key_hash = rescue_hash_elements(&[pub_x, pub_y]);
-    let mut pub_key_hash_bits = Vec::with_capacity(NEW_PUBKEY_HASH_WIDTH);
-    append_le_fixed_width(&mut pub_key_hash_bits, &pub_key_hash, NEW_PUBKEY_HASH_WIDTH);
-    let mut bytes = le_bit_vector_into_bytes(&pub_key_hash_bits);
-    bytes.reverse();
-    bytes
-}
-
-fn rescue_hash_fr(input: Vec<bool>) -> Fr {
-    RESCUE_PARAMS.with(|params| {
-        let packed = multipack::compute_multipacking::<Engine>(&input);
-        let sponge_output = rescue_hash::<Engine>(params, &packed);
-        assert_eq!(sponge_output.len(), 1, "rescue hash problem");
-        sponge_output[0]
-    })
-}
-
-fn rescue_hash_elements(input: &[Fr]) -> Fr {
-    RESCUE_PARAMS.with(|params| {
-        let sponge_output = rescue_hash::<Engine>(params, &input);
-        assert_eq!(sponge_output.len(), 1, "rescue hash problem");
-        sponge_output[0]
-    })
-}
-
-pub fn rescue_hash_tx_msg(msg: &[u8]) -> Vec<u8> {
-    let mut msg_bits = bytes_into_be_bits(msg);
-    msg_bits.resize(PAD_MSG_BEFORE_HASH_BITS_LEN, false);
-    let hash_fr = rescue_hash_fr(msg_bits);
-    let mut hash_bits = Vec::new();
-    append_le_fixed_width(&mut hash_bits, &hash_fr, 256);
-    pack_bits_into_bytes(hash_bits)
-}
diff --git a/token-core/zksync-crypto/web-wasm.js b/token-core/zksync-crypto/web-wasm.js
deleted file mode 100644
index 014e8bd2..00000000
--- a/token-core/zksync-crypto/web-wasm.js
+++ /dev/null
@@ -1,59 +0,0 @@
-const fs = require('fs');
-
-const wasmFile = './dist/zksync-crypto-web_bg.wasm';
-const jsFile = './dist/zksync-crypto-web.js';
-
-const wasmData = fs.readFileSync(wasmFile);
-
-// Strings that are inserted automatically by wasm-pack, but
-// break library in it's current implementation
-const brokenStrings = [
-    // This substring is unique, had to
-    // write only part of line to make the RegExp works.
-    // Probably will rewrite in the future
-    `input = import.meta.url.replace`
-];
-
-let jsCode = fs.readFileSync(jsFile).toString();
-
-// Commenting out broken strings
-brokenStrings.forEach((str) => {
-    jsCode = jsCode.replace(new RegExp(str, 'g'), '// ' + str);
-});
-
-jsCode += `
-const base64WasmCode = \`${wasmData.toString('base64')}\`;
-
-function base64ToArrayBuffer(base64) {
-  const binaryString = window.atob(base64);
-  const length = binaryString.length;
-  const bytes = new Uint8Array(length);
-
-  for (let i = 0; i < length; i++) {
-      bytes[i] = binaryString.charCodeAt(i);
-  }
-  return bytes.buffer;
-}
-
-const wasmBytes = base64ToArrayBuffer(base64WasmCode);
-
-const wasmResponseInit = {
-  "status" : 200 ,
-  "statusText" : "ok.",
-  headers: {
-    'Content-Type': 'application/wasm',
-    'Content-Length': wasmBytes.length
-  }
-};
-
-export async function loadZkSyncCrypto(wasmFileUrl) {
-  if (!wasmFileUrl) {
-    const wasmResponse = new Response(wasmBytes, wasmResponseInit);
-    await init(wasmResponse);
-  } else {
-    await init(DefaultZksyncCryptoWasmURL);
-  }
-}
-`;
-
-fs.writeFileSync(jsFile, jsCode);